diff --git a/.env.development b/.env.development
index 7c66437..c363340 100644
--- a/.env.development
+++ b/.env.development
@@ -9,14 +9,12 @@ ENV = 'development'
 
 # 接口地址 http://8.130.96.163:8899
 # 线上
- VUE_APP_BASE_API  = 'https://baiyee.vip'
-# 测试
-# VUE_APP_BASE_API  = 'http://39.100.77.21:8899'
-# VUE_APP_BASE_API  = 'http://172.18.0.225:8899'//xy
+ VUE_APP_BASE_API  = 'http://39.100.77.21:8899'
+
 # ts
 # VUE_APP_BASE_API  = 'http://172.18.0.228:8899'
-#VUE_APP_BASE_API  = 'http://172.18.1.8:8899jt'
 VUE_APP_BASE_IMG  = 'https://baiyee.vip'
+# 测试
 # VUE_APP_BASE_IMG  = 'http://39.100.77.21:8899'
 VUE_APP_WS_API = 'wss://baiyee.vip'
 
diff --git a/src/api/index.js b/src/api/index.js
index ee84f2b..40f0c70 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1137,7 +1137,7 @@ export function activityListUploadFiles(data) {
 // 预测式外呼账号配置
 export function addAccount(userName, passWord) {
   return request({
-    url: baseObj.url + '/api/account/conf',
+    url: baseObj.url + 'api/account/conf',
     method: 'get',
     params: {
       userName,
@@ -1169,4 +1169,19 @@ export function editActivity(data) {
     data
   })
 }
-
+// 广告模型上传
+export function modeUploadFiles(data) {
+  return request({
+    url: baseObj.url + 'api/mode/record/upload/files',
+    method: 'post',
+    data
+  })
+}
+// 广告模型-建模
+export function recordBuild(params) {
+  return request({
+    url: baseObj.url + 'api/mode/record/build',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/components/DateRangePicker/index.vue b/src/components/DateRangePicker/index.vue
index b9ea749..4eaf37f 100644
--- a/src/components/DateRangePicker/index.vue
+++ b/src/components/DateRangePicker/index.vue
@@ -1,52 +1,52 @@
-<!--
- * @Description:
- * @Autor: 飘泊客
- * @Date: 2021-12-02 16:54:53
- * @LastEditors: 飘泊客
- * @LastEditTime: 2022-11-02 10:52:06
--->
-<script>
-import { DatePicker, DatePickerOptions } from 'element-ui'
-import { calendarShortcuts } from '@/utils/shortcuts'
-
-export default {
-  name: 'DateRangePicker',
-  mixins: [DatePicker],
-  props: {
-    type: {
-      type: String,
-      default: 'daterange'
-    },
-    valueFormat: {
-      type: String,
-      default: 'yyyy-MM-dd HH:mm:ss'
-    },
-    defaultTime: {
-      type: Array,
-      default: _ => ['00:00:00', '23:59:59']
-    },
-    pickerOptions: {
-      type: DatePickerOptions,
-      default: _ => {
-        return { shortcuts: calendarShortcuts }
-      }
-    },
-    size: {
-      type: String,
-      default: 'small'
-    },
-    rangeSeparator: {
-      type: String,
-      default: ':'
-    },
-    startPlaceholder: {
-      type: String,
-      default: '开始日期'
-    },
-    endPlaceholder: {
-      type: String,
-      default: '结束日期'
-    }
-  }
-}
-</script>
+<!--
+ * @Description:
+ * @Autor: 飘泊客
+ * @Date: 2021-12-02 16:54:53
+ * @LastEditors: 飘泊客
+ * @LastEditTime: 2022-11-02 10:52:06
+-->
+<script>
+import { DatePicker, DatePickerOptions } from 'element-ui'
+import { calendarShortcuts } from '@/utils/shortcuts'
+
+export default {
+  name: 'DateRangePicker',
+  mixins: [DatePicker],
+  props: {
+    type: {
+      type: String,
+      default: 'daterange'
+    },
+    valueFormat: {
+      type: String,
+      default: 'yyyy-MM-dd HH:mm:ss'
+    },
+    defaultTime: {
+      type: Array,
+      default: _ => ['00:00:00', '23:59:59']
+    },
+    pickerOptions: {
+      type: DatePickerOptions,
+      default: _ => {
+        return { shortcuts: calendarShortcuts }
+      }
+    },
+    size: {
+      type: String,
+      default: 'small'
+    },
+    rangeSeparator: {
+      type: String,
+      default: ':'
+    },
+    startPlaceholder: {
+      type: String,
+      default: '开始日期'
+    },
+    endPlaceholder: {
+      type: String,
+      default: '结束日期'
+    }
+  }
+}
+</script>
diff --git a/src/components/Echarts/Radar.vue b/src/components/Echarts/Radar.vue
index 52480d8..f4665b5 100644
--- a/src/components/Echarts/Radar.vue
+++ b/src/components/Echarts/Radar.vue
@@ -1,122 +1,134 @@
-<template>
-  <div class="chart" />
-</template>
-
-<script>
-import echarts from 'echarts'
-require('echarts/theme/macarons') // echarts theme
-import { debounce } from '@/utils'
-
-// const animationDuration = 3000
-
-export default {
-  props: {
-    // seriesValueDefault: {
-    //   type: Array,
-    //   default: function() { return [] }
-    // },
-    // seriesValueReality: {
-    //   type: Array,
-    //   default: function() { return [] }
-    // },
-    seriesValue: {
-      type: Object,
-      default: function() { return {} }
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  mounted() {
-    this.initChart(this.seriesValue)
-    this.__resizeHandler = debounce(() => {
-      if (this.chart) {
-        this.chart.resize()
-      }
-    }, 100)
-    window.addEventListener('resize', this.__resizeHandler)
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    window.removeEventListener('resize', this.__resizeHandler)
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart(data) {
-      this.chart = echarts.init(this.$el, 'macarons', { width: '560px', height: '312px' })
-
-      this.chart.setOption({
-        // title: {
-        //   text: 'Basic Radar Chart',
-        //   // top: '5%',
-        //   // left: '3%'
-        //   x: 'center' // 可设定图例在左、右、居中
-        // },
-        legend: {
-          data: ['平均质量分', '您的质量分'],
-          x: 'center', // 可设定图例在左、右、居中
-          y: 'bottom' // 可设定图例在上、下、居中
-          // top: '85%', // 图例距离顶部边距
-          // left: '60%' // 图例距离左侧边距
-
-        },
-        radar: {
-          // shape: 'circle',
-          indicator: [
-            // { name: '到达率', max: 6000 },
-            // { name: '记忆率', max: 6000 },
-            // { name: '喜欢程度', max: 6000 },
-            // { name: '影响购买意愿程度', max: 6000 },
-            // { name: '二跳率', max: 6000 }
-            { name: '广告展示量', max: 6000 },
-            { name: '广告点击量', max: 6000 },
-            { name: '广告到达率', max: 6000 },
-            { name: '广告二跳率', max: 6000 },
-            { name: '广告转化率', max: 6000 }
-          ],
-          // 圆的半径，数组的第一项是内半径，第二项是外半径。
-          radius: 120
-          // (圆外的标签)雷达图每个指示器名称的配置项。
-          // name: {
-          //   formatter: '{value}',
-          //   textStyle: {
-          //     fontSize: 15,
-          //     color: '#000'
-          //   }
-          // },
-          // 指示器名称和指示器轴的距离。[ default: 15 ]
-          // nameGap: 15
-        },
-        series: [
-          {
-            name: 'Budget vs spending',
-            type: 'radar',
-            data: [
-              {
-                value: data.reality,
-                // value: [4200, 3000, 20000, 35000, 50000, 18000],
-                name: '您的质量分'
-              },
-              {
-                value: data.default,
-                // value: [5000, 14000, 28000, 26000, 42000, 21000],
-                name: '平均质量分'
-              }
-            ]
-          }
-        ]
-      })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.chart{
-  padding: 20px;
-}
-</style>
+<template>
+  <div class="chart" />
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+// const animationDuration = 3000
+
+export default {
+  props: {
+    // seriesValueDefault: {
+    //   type: Array,
+    //   default: function() { return [] }
+    // },
+    // seriesValueReality: {
+    //   type: Array,
+    //   default: function() { return [] }
+    // },
+    seriesValue: {
+      type: Object,
+      default: function() { return {} }
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart(this.seriesValue)
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    resettingChart() {
+    },
+    initChart(data) {
+      this.chart = echarts.init(this.$el, 'macarons', { width: '560px', height: '312px' })
+
+      this.chart.setOption({
+        // title: {
+        //   text: 'Basic Radar Chart',
+        //   // top: '5%',
+        //   // left: '3%'
+        //   x: 'center' // 可设定图例在左、右、居中
+        // },
+        // toolbox: {
+        //   feature: {
+        //     restore: {
+        //       onclick: () => {
+        //         console.log('00000')
+        //         this.resettingChart()
+        //       }
+        //     }
+        //   }
+        // },
+        legend: {
+          data: ['平均质量分', '您的质量分'],
+          x: 'center', // 可设定图例在左、右、居中
+          y: 'bottom' // 可设定图例在上、下、居中
+          // top: '85%', // 图例距离顶部边距
+          // left: '60%' // 图例距离左侧边距
+
+        },
+        radar: {
+          // shape: 'circle',
+          indicator: [
+            // { name: '到达率', max: 6000 },
+            // { name: '记忆率', max: 6000 },
+            // { name: '喜欢程度', max: 6000 },
+            // { name: '影响购买意愿程度', max: 6000 },
+            // { name: '二跳率', max: 6000 }
+            { name: '广告展示量', max: 6000 },
+            { name: '广告点击量', max: 6000 },
+            { name: '广告到达率', max: 6000 },
+            { name: '广告二跳率', max: 6000 },
+            { name: '广告转化率', max: 6000 }
+          ],
+          // 圆的半径，数组的第一项是内半径，第二项是外半径。
+          radius: 120
+          // (圆外的标签)雷达图每个指示器名称的配置项。
+          // name: {
+          //   formatter: '{value}',
+          //   textStyle: {
+          //     fontSize: 15,
+          //     color: '#000'
+          //   }
+          // },
+          // 指示器名称和指示器轴的距离。[ default: 15 ]
+          // nameGap: 15
+        },
+        series: [
+          {
+            name: 'Budget vs spending',
+            type: 'radar',
+            data: [
+              {
+                value: data.reality,
+                // value: [4200, 3000, 20000, 35000, 50000, 18000],
+                name: '您的质量分'
+              },
+              {
+                value: data.default,
+                // value: [5000, 14000, 28000, 26000, 42000, 21000],
+                name: '平均质量分'
+              }
+            ]
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.chart{
+  padding: 20px;
+}
+</style>
diff --git a/src/components/Echarts/RadarChart.vue b/src/components/Echarts/RadarChart.vue
index de70e52..7285b1f 100644
--- a/src/components/Echarts/RadarChart.vue
+++ b/src/components/Echarts/RadarChart.vue
@@ -1,120 +1,120 @@
-<template>
-  <div :class="className" :style="{height:height,width:width}" />
-</template>
-
-<script>
-import echarts from 'echarts'
-require('echarts/theme/macarons') // echarts theme
-import { debounce } from '@/utils'
-
-const animationDuration = 3000
-
-export default {
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
-    },
-    width: {
-      type: String,
-      default: '100%'
-    },
-    height: {
-      type: String,
-      default: '300px'
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  mounted() {
-    this.initChart()
-    this.__resizeHandler = debounce(() => {
-      if (this.chart) {
-        this.chart.resize()
-      }
-    }, 100)
-    window.addEventListener('resize', this.__resizeHandler)
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    window.removeEventListener('resize', this.__resizeHandler)
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el, 'macarons')
-
-      this.chart.setOption({
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
-        },
-        radar: {
-          radius: '66%',
-          center: ['50%', '42%'],
-          splitNumber: 8,
-          splitArea: {
-            areaStyle: {
-              color: 'rgba(127,95,132,.3)',
-              opacity: 1,
-              shadowBlur: 45,
-              shadowColor: 'rgba(0,0,0,.5)',
-              shadowOffsetX: 0,
-              shadowOffsetY: 15
-            }
-          },
-          indicator: [
-            { name: 'Sales', max: 10000 },
-            { name: 'Administration', max: 20000 },
-            { name: 'Information Techology', max: 20000 },
-            { name: 'Customer Support', max: 20000 },
-            { name: 'Development', max: 20000 },
-            { name: 'Marketing', max: 20000 }
-          ]
-        },
-        legend: {
-          left: 'center',
-          bottom: '10',
-          data: ['Allocated Budget', 'Expected Spending', 'Actual Spending']
-        },
-        series: [{
-          type: 'radar',
-          symbolSize: 0,
-          areaStyle: {
-            normal: {
-              shadowBlur: 13,
-              shadowColor: 'rgba(0,0,0,.2)',
-              shadowOffsetX: 0,
-              shadowOffsetY: 10,
-              opacity: 1
-            }
-          },
-          data: [
-            {
-              value: [5000, 7000, 12000, 11000, 15000, 14000],
-              name: 'Allocated Budget'
-            },
-            {
-              value: [4000, 9000, 15000, 15000, 13000, 11000],
-              name: 'Expected Spending'
-            },
-            {
-              value: [5500, 11000, 12000, 15000, 12000, 12000],
-              name: 'Actual Spending'
-            }
-          ],
-          animationDuration: animationDuration
-        }]
-      })
-    }
-  }
-}
-</script>
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+const animationDuration = 3000
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        radar: {
+          radius: '66%',
+          center: ['50%', '42%'],
+          splitNumber: 8,
+          splitArea: {
+            areaStyle: {
+              color: 'rgba(127,95,132,.3)',
+              opacity: 1,
+              shadowBlur: 45,
+              shadowColor: 'rgba(0,0,0,.5)',
+              shadowOffsetX: 0,
+              shadowOffsetY: 15
+            }
+          },
+          indicator: [
+            { name: 'Sales', max: 10000 },
+            { name: 'Administration', max: 20000 },
+            { name: 'Information Techology', max: 20000 },
+            { name: 'Customer Support', max: 20000 },
+            { name: 'Development', max: 20000 },
+            { name: 'Marketing', max: 20000 }
+          ]
+        },
+        legend: {
+          left: 'center',
+          bottom: '10',
+          data: ['Allocated Budget', 'Expected Spending', 'Actual Spending']
+        },
+        series: [{
+          type: 'radar',
+          symbolSize: 0,
+          areaStyle: {
+            normal: {
+              shadowBlur: 13,
+              shadowColor: 'rgba(0,0,0,.2)',
+              shadowOffsetX: 0,
+              shadowOffsetY: 10,
+              opacity: 1
+            }
+          },
+          data: [
+            {
+              value: [5000, 7000, 12000, 11000, 15000, 14000],
+              name: 'Allocated Budget'
+            },
+            {
+              value: [4000, 9000, 15000, 15000, 13000, 11000],
+              name: 'Expected Spending'
+            },
+            {
+              value: [5500, 11000, 12000, 15000, 12000, 12000],
+              name: 'Actual Spending'
+            }
+          ],
+          animationDuration: animationDuration
+        }]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/store/modules/api.js b/src/store/modules/api.js
index 9b84bf5..1f4b319 100644
--- a/src/store/modules/api.js
+++ b/src/store/modules/api.js
@@ -1,46 +1,45 @@
-/*
- * @Description:
- * @Autor: 飘泊客
- * @Date: 2021-12-03 11:10:17
- * @LastEditors: 飘泊客
- * @LastEditTime: 2022-03-17 13:40:48
- */
-const baseUrl = process.env.VUE_APP_BASE_API
-const baseImgUrl = process.env.VUE_APP_BASE_IMG
-console.log('vuex==', baseImgUrl)
-const api = {
-  state: {
-    // 部署包上传
-    deployUploadApi: baseUrl + '/api/deploy/upload',
-    // SQL脚本上传
-    databaseUploadApi: baseUrl + '/api/database/upload',
-    // 任务导入
-    fileUpload: baseUrl + '/api/task/fileUpload',
-    // 用户批量导入
-    importUsers: baseUrl + '/api-management/api/users/importUsers',
-    // 实时控制台
-    socketApi: baseUrl + '/websocket?token=kl',
-    // 图片上传
-    imagesUploadApi: baseUrl + '/api-management/api/pictures',
-    // 修改头像
-    updateAvatarApi: baseUrl + '/api-management/api/users/updateAvatar',
-    // 上传证件照
-    picturesUpload: baseUrl + '/api-management/api/pictures/upload',
-    // 上传文件到七牛云
-    qiNiuUploadApi: baseUrl + '/api/qiNiuContent',
-    // Sql 监控
-    sqlApi: baseUrl + '/druid/index.html',
-    // swagger
-    swaggerApi: baseUrl + '/swagger-ui.html',
-    // 文件上传
-    fileUploadApi: baseUrl + '/api/localStorage',
-    // baseUrl，
-    baseApi: baseUrl,
-    // 图片专用
-    baseImgUrl: baseImgUrl,
-    // 任务导入-公海
-    taskFileUpload: 'api-source/source/uploadFile/taskFileUpload'
-  }
-}
-
-export default api
+/*
+ * @Description:
+ * @Autor: 飘泊客
+ * @Date: 2021-12-03 11:10:17
+ * @LastEditors: 飘泊客
+ * @LastEditTime: 2022-03-17 13:40:48
+ */
+const baseUrl = process.env.VUE_APP_BASE_API
+const baseImgUrl = process.env.VUE_APP_BASE_IMG
+const api = {
+  state: {
+    // 部署包上传
+    deployUploadApi: baseUrl + '/api/deploy/upload',
+    // SQL脚本上传
+    databaseUploadApi: baseUrl + '/api/database/upload',
+    // 任务导入
+    fileUpload: baseUrl + '/api/task/fileUpload',
+    // 用户批量导入
+    importUsers: baseUrl + '/api-management/api/users/importUsers',
+    // 实时控制台
+    socketApi: baseUrl + '/websocket?token=kl',
+    // 图片上传
+    imagesUploadApi: baseUrl + '/api-management/api/pictures',
+    // 修改头像
+    updateAvatarApi: baseUrl + '/api-management/api/users/updateAvatar',
+    // 上传证件照
+    picturesUpload: baseUrl + '/api-management/api/pictures/upload',
+    // 上传文件到七牛云
+    qiNiuUploadApi: baseUrl + '/api/qiNiuContent',
+    // Sql 监控
+    sqlApi: baseUrl + '/druid/index.html',
+    // swagger
+    swaggerApi: baseUrl + '/swagger-ui.html',
+    // 文件上传
+    fileUploadApi: baseUrl + '/api/localStorage',
+    // baseUrl，
+    baseApi: baseUrl,
+    // 图片专用
+    baseImgUrl: baseImgUrl,
+    // 任务导入-公海
+    taskFileUpload: 'api-source/source/uploadFile/taskFileUpload'
+  }
+}
+
+export default api
diff --git a/src/views/adminGroup/group/formulaIndex.vue b/src/views/adminGroup/group/formulaIndex.vue
index db478b6..10469da 100644
--- a/src/views/adminGroup/group/formulaIndex.vue
+++ b/src/views/adminGroup/group/formulaIndex.vue
@@ -1,469 +1,469 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--工具栏-->
-      <div class="head-container">
-        <div>
-          <!-- 搜索 -->
-          <label class="y-label">QA名称：</label>
-          <el-input
-            v-model="query.scriptOrganizeName"
-            clearable
-            size="small"
-            placeholder="请输入"
-            style="width: 170px;"
-            class="filter-item"
-            @keyup.enter.native="crud.toQuery"
-          />
-          <!-- <label class="y-label">话术分组：</label>
-          <el-select
-            v-model="query.type"
-            size="small"
-            placeholder="请选择"
-            style="width: 170px"
-            class="filter-item"
-            @change="crud.toQuery"
-          >
-            <el-option
-              v-for="item in formulaList"
-              :key="item.id"
-              :label="item.scriptOrganizeName"
-              :value="item.id"
-            />
-          </el-select> -->
-          <label class="y-label">启用状态：</label>
-          <el-select
-            v-model="query.status"
-            clearable
-            size="small"
-            placeholder="请选择"
-            class="filter-item"
-            style="width: 170px"
-            @change="crud.toQuery"
-          >
-            <el-option :key="true" label="启用" :value="true" />
-            <el-option :key="false" label="禁用" :value="false" />
-          </el-select>
-          <rrOperation />
-        </div>
-        <div class="crud-opts">
-          <span class="crud-opts-left">
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="primary"
-              icon="el-icon-plus"
-              @click="operationFun({type: 'add'})"
-            >
-              新增
-            </el-button>
-          </span>
-        </div>
-        <div>
-          <div v-if="!inputshow" class="content-end">
-            <div><span style="color: rgb(64, 158, 255);">置顶话术：</span><span :class="{ 'c-red': topScript == '' }">{{ topScript ? topScript : '尚未设置置顶话术' }}</span></div>
-            <el-button size="mini" type="text" @click="showTopScript">设置</el-button>
-          </div>
-          <div v-else>
-            <el-input
-              v-model="topInputScript"
-              type="textarea"
-              :autosize="{ minRows: 3, maxRows: 6}"
-              maxlength="250"
-              show-word-limit
-              class="textarea"
-              placeholder="请输入置顶话术内容"
-            />
-            <div class="mt-5">
-              <el-button
-                size="mini"
-                type="primary"
-                @click="addTopScript"
-              >
-                提交
-              </el-button>
-              <el-button
-                size="mini"
-                @click="inputshow = false"
-              >
-                取消
-              </el-button>
-            </div>
-          </div>
-        </div>
-      </div>
-      <!--表格渲染-->
-      <el-table ref="tables" v-loading="crud.loading" :data="crud.data.content" :header-cell-style="{'text-align':'left'}" style="width: 100%;">
-        <el-table-column type="expand">
-          <template slot-scope="props">
-            <el-table :data="props.row.scriptTemplateList" :header-cell-style="{'text-align':'center'}" :cell-style="{'text-align':'center'}">
-              <el-table-column :show-overflow-tooltip="true" prop="question" label="问题" />
-              <el-table-column :show-overflow-tooltip="true" prop="answer" label="解答" />
-              <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
-                <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="操作"
-                width="100"
-                fixed="right"
-              >
-                <template slot-scope="scope">
-                  <el-button
-                    class="filter-item"
-                    size="mini"
-                    type="text"
-                    @click.stop="operationFun({type: 'editChild', data: scope.row})"
-                  >
-                    修改
-                  </el-button>
-                  <el-button
-                    class="filter-item"
-                    size="mini"
-                    type="text"
-                    @click.stop="delformula(scope.row.id)"
-                  >
-                    删除
-                  </el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="scriptOrganizeName" label="QA问题分类" />
-        <el-table-column label="启用状态" width="150px">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.status" active-color="#409EFF" inactive-color="#F56C6C" @change="changeEnabled(scope.row, scope.row.status)" />
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作"
-          width="100"
-          fixed="right"
-        >
-          <template slot-scope="scope">
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="text"
-              @click.stop="operationFun({type: 'edit', data: scope.row})"
-            >
-              修改
-            </el-button>
-            <!-- <el-button
-              class="filter-item"
-              size="mini"
-              type="text"
-              @click.stop="operationFun({type: 'del', data: scope.row})"
-            >
-              删除
-            </el-button> -->
-          </template>
-        </el-table-column>
-        <template #empty>
-          <div style="width: 100%; height: 450px;display: flex; flex-direction: column; justify-content: center;align-items: center">
-            <img src="@/assets/images/zanwu.png" alt="">
-            <div>暂无数据</div>
-          </div>
-        </template>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </el-row>
-    <el-dialog :visible.sync="formulaProp" append-to-body :close-on-click-modal="false" :title="propTitle" width="520px" @close="beforeClose">
-      <el-form ref="formulaRefForm" :inline="true" :model="formulaForm" size="small" label-width="85px">
-        <el-form-item v-if="operation !== 'editChild'" label="QA分类" prop="scriptOrganizeName" :rules="{ required: true, message: '请选择或新建分类' }">
-          <el-select
-            v-if="operation != 'edit'"
-            v-model="formulaForm.scriptOrganizeName"
-            filterable
-            allow-create
-            default-first-option
-            clearable
-            placeholder="请选择或新建分类"
-          >
-            <el-option
-              v-for="item in formulaList"
-              :key="item.id"
-              :label="item.scriptOrganizeName"
-              :value="item.id"
-            />
-          </el-select>
-          <el-input v-else v-model="formulaForm.scriptOrganizeName" placeholder="请输入分组名" />
-        </el-form-item>
-        <div v-show="operation !== 'edit'">
-          <div v-for="(item, index) in formulaForm.scriptTemplateList" :key="index">
-            <div class="group-item">话术{{ index + 1 }}</div>
-            <el-form-item :prop="`scriptTemplateList[${index}].question`" :rules="{ required: true, message: '请输入QA问题' }">
-              <span slot="label">QA问题</span>
-              <el-input v-model="item.question" placeholder="请输入QA问题" style="width: 340px" />
-            </el-form-item>
-            <el-form-item :prop="`scriptTemplateList[${index}].answer`" :rules="{ required: true, message: '请输入问题解答' }">
-              <span slot="label">问题解答</span>
-              <el-input v-model="item.answer" type="textarea" :autosize="{ minRows: 3, maxRows: 6}" placeholder="请输入问题解答" maxlength="250" style="width: 340px" />
-              <el-button v-show="index != 0" type="danger" icon="el-icon-delete" circle class="ml-5" @click="delGroup(index)" />
-            </el-form-item>
-          </div>
-        </div>
-      </el-form>
-      <div slot="footer" class="dialog-footer u-flex u-flex-between">
-        <div>
-          <el-button v-if="operation == 'add'" type="primary" icon="el-icon-plus" @click="addGroup">新增QA</el-button>
-        </div>
-        <div>
-          <el-button type="text" @click="formulaProp = false">取消</el-button>
-          <el-button
-            :loading="subloading"
-            type="primary"
-            @click="hankShiftSave"
-          >确认</el-button>
-        </div>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { setScriptAdd, getQueryOrganize, setScriptUpdate, setScriptDel, setScriptOrganizeUpdate, addTopScript } from '@/api/index'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import { mapGetters } from 'vuex'
-const defaultForm = { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 'false', roles: [], jobs: [], dept: { id: null }, phone: null }
-export default {
-  name: 'FormulaIndex',
-  components: { rrOperation, pagination },
-  cruds() {
-    return CRUD({ title: '话术管理', url: 'api-management/api/script/organize/queryAll' })
-  },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  data() {
-    return {
-      height: document.documentElement.clientHeight - 180 + 'px;',
-      formulaList: [],
-      formulaProp: false,
-      operation: 'add',
-      subloading: false,
-      formulaForm: {
-        scriptOrganizeName: '',
-        scriptTemplateList: [
-          {
-            question: '',
-            answer: ''
-          }
-        ]
-      },
-      inputshow: false,
-      propTitle: '新增话术',
-      topScript: '',
-      topInputScript: ''
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'user'
-    ])
-  },
-  watch: {
-    'crud.data': {
-      handler(newVal, oldV) {
-        this.topScript = newVal.top.answer
-      },
-      deep: true
-    }
-  },
-  created() {},
-  mounted: function() {
-    const that = this
-    window.onresize = function temp() {
-      that.height = document.documentElement.clientHeight - 180 + 'px;'
-    }
-  },
-  methods: {
-    changevisible(v) {
-      this.userKey = Math.ceil(Math.random() * 100)
-    },
-    operationFun(obj = {}) {
-      const { type = '', data = {}} = obj
-      switch (type) {
-        case 'add':
-          this.propTitle = '新增话术'
-          break
-        case 'edit':
-        case 'editChild':
-          this.propTitle = '编辑话术'
-          break
-      }
-      const loading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      getQueryOrganize({ userId: this.user.id }).then(res => {
-        this.formulaList = res.data.organize
-        this.operation = type
-        this.formulaProp = true
-        loading.close()
-        if (type === 'edit') {
-          this.formulaForm = Object.assign({}, data)
-        } else if (type === 'editChild') {
-          this.formulaForm.scriptTemplateList = [Object.assign({}, data)]
-        }
-      }).catch(() => {
-        loading.close()
-      })
-    },
-    // 新增小组
-    addGroup() {
-      this.formulaForm.scriptTemplateList.push({
-        title: '',
-        answer: ''
-      })
-    },
-    delGroup(index) {
-      this.formulaForm.scriptTemplateList.splice(index, 1)
-    },
-    showTopScript() {
-      this.topInputScript = this.topScript
-      this.inputshow = true
-    },
-    addTopScript() {
-      addTopScript({ answer: this.topInputScript }).then(res => {
-        this.topScript = this.topInputScript
-        this.$message.success('设置成功')
-        this.inputshow = false
-      })
-    },
-    // 改变状态
-    changeEnabled(data, val) {
-      this.$confirm('此操作将修改' + data.scriptOrganizeName + '的状态, 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        setScriptOrganizeUpdate({ status: val, id: data.id }).then(res => {
-          this.crud.notify('成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          data.status = !data.status
-        })
-      }).catch(() => {
-        data.status = !data.status
-      })
-    },
-    hankShiftSave() {
-      this.$refs.formulaRefForm.validate(async(valid) => {
-        if (valid) {
-          const data = Object.assign({}, this.formulaForm)
-          if (this.operation === 'add') {
-            data.scriptOrganizeId = ''
-            if (typeof data.scriptOrganizeName === 'number') {
-              data.id = data.scriptOrganizeName
-              data.scriptOrganizeName = ''
-            }
-            setScriptAdd(data).then(res => {
-              if (res.status === 0) {
-                this.crud.toQuery()
-              }
-              this.formulaProp = false
-            })
-          }
-          if (this.operation === 'edit') {
-            const res = await setScriptOrganizeUpdate(data)
-            this.formulaProp = false
-            if (res.status === 0) {
-              this.crud.toQuery()
-            }
-          }
-          if (this.operation === 'editChild') {
-            const res = await setScriptUpdate(data.scriptTemplateList[0])
-            this.formulaProp = false
-            if (res.status === 0) {
-              this.crud.toQuery()
-            }
-          }
-        }
-      })
-    },
-    // 删除
-    delformula(id) {
-      this.$confirm('请确定要删除话术吗', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          setScriptDel(id).then(res => {
-            this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-            this.crud.toQuery()
-          })
-        })
-        .catch(() => {})
-    },
-    beforeClose() {
-      this.$refs.formulaRefForm.resetFields()
-      const data = {
-        scriptOrganizeName: '',
-        scriptTemplateList: [
-          {
-            question: '',
-            answer: ''
-          }
-        ]
-      }
-      this.formulaForm = data
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .group-item {
-    width: 80px;
-    line-height: 32px;
-    float: none;
-    display: inline-block;
-    color: #FFAA00;
-    text-align: left;
-    vertical-align: middle;
-    padding: 0 12px 0 0;
-    font-weight: bold;
-    position: relative;
-    &::before {
-      content: "";
-      border-left: 3px solid #FFAA00;
-      margin-right: 4px;
-      border-radius: 10px;
-    }
-  }
-  .c-red {
-    color: rgb(245, 108, 108);
-  }
-  .content-end {
-    display: inline-block;
-    min-width: 350px;
-    max-width: 600px;
-    padding: 7px 5px 0px;
-    background: #fafafa!important;
-    border: 1px solid #f0f0f0;
-    border-radius: 4px;
-    font-style: normal;
-    font-weight: 500;
-    font-size: 12px;
-    color: #333;
-    word-wrap: break-word
-    // display: flex;
-    // justify-content: space-between;
-    // align-items: center;
-    // flex-wrap: wrap;
-  }
-  .textarea{
-    max-width: 600px;
-  }
-</style>
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--工具栏-->
+      <div class="head-container">
+        <div>
+          <!-- 搜索 -->
+          <label class="y-label">QA名称：</label>
+          <el-input
+            v-model="query.scriptOrganizeName"
+            clearable
+            size="small"
+            placeholder="请输入"
+            style="width: 170px;"
+            class="filter-item"
+            @keyup.enter.native="crud.toQuery"
+          />
+          <!-- <label class="y-label">话术分组：</label>
+          <el-select
+            v-model="query.type"
+            size="small"
+            placeholder="请选择"
+            style="width: 170px"
+            class="filter-item"
+            @change="crud.toQuery"
+          >
+            <el-option
+              v-for="item in formulaList"
+              :key="item.id"
+              :label="item.scriptOrganizeName"
+              :value="item.id"
+            />
+          </el-select> -->
+          <label class="y-label">启用状态：</label>
+          <el-select
+            v-model="query.status"
+            clearable
+            size="small"
+            placeholder="请选择"
+            class="filter-item"
+            style="width: 170px"
+            @change="crud.toQuery"
+          >
+            <el-option :key="true" label="启用" :value="true" />
+            <el-option :key="false" label="禁用" :value="false" />
+          </el-select>
+          <rrOperation />
+        </div>
+        <div class="crud-opts">
+          <span class="crud-opts-left">
+            <el-button
+              class="filter-item"
+              size="mini"
+              type="primary"
+              icon="el-icon-plus"
+              @click="operationFun({type: 'add'})"
+            >
+              新增
+            </el-button>
+          </span>
+        </div>
+        <div>
+          <div v-if="!inputshow" class="content-end">
+            <div><span style="color: rgb(64, 158, 255);">置顶话术：</span><span :class="{ 'c-red': topScript == '' }">{{ topScript ? topScript : '尚未设置置顶话术' }}</span></div>
+            <el-button size="mini" type="text" @click="showTopScript">设置</el-button>
+          </div>
+          <div v-else>
+            <el-input
+              v-model="topInputScript"
+              type="textarea"
+              :autosize="{ minRows: 3, maxRows: 6}"
+              maxlength="250"
+              show-word-limit
+              class="textarea"
+              placeholder="请输入置顶话术内容"
+            />
+            <div class="mt-5">
+              <el-button
+                size="mini"
+                type="primary"
+                @click="addTopScript"
+              >
+                提交
+              </el-button>
+              <el-button
+                size="mini"
+                @click="inputshow = false"
+              >
+                取消
+              </el-button>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!--表格渲染-->
+      <el-table ref="tables" v-loading="crud.loading" :data="crud.data.content" :header-cell-style="{'text-align':'left'}" style="width: 100%;">
+        <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-table :data="props.row.scriptTemplateList" :header-cell-style="{'text-align':'center'}" :cell-style="{'text-align':'center'}">
+              <el-table-column :show-overflow-tooltip="true" prop="question" label="问题" />
+              <el-table-column :show-overflow-tooltip="true" prop="answer" label="解答" />
+              <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
+                <template slot-scope="scope">
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="操作"
+                width="100"
+                fixed="right"
+              >
+                <template slot-scope="scope">
+                  <el-button
+                    class="filter-item"
+                    size="mini"
+                    type="text"
+                    @click.stop="operationFun({type: 'editChild', data: scope.row})"
+                  >
+                    修改
+                  </el-button>
+                  <el-button
+                    class="filter-item"
+                    size="mini"
+                    type="text"
+                    @click.stop="delformula(scope.row.id)"
+                  >
+                    删除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="scriptOrganizeName" label="QA问题分类" />
+        <el-table-column label="启用状态" width="150px">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.status" active-color="#409EFF" inactive-color="#F56C6C" @change="changeEnabled(scope.row, scope.row.status)" />
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          width="75"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-button
+              class="filter-item"
+              size="mini"
+              type="text"
+              @click.stop="operationFun({type: 'edit', data: scope.row})"
+            >
+              修改
+            </el-button>
+            <!-- <el-button
+              class="filter-item"
+              size="mini"
+              type="text"
+              @click.stop="operationFun({type: 'del', data: scope.row})"
+            >
+              删除
+            </el-button> -->
+          </template>
+        </el-table-column>
+        <template #empty>
+          <div style="width: 100%; height: 450px;display: flex; flex-direction: column; justify-content: center;align-items: center">
+            <img src="@/assets/images/zanwu.png" alt="">
+            <div>暂无数据</div>
+          </div>
+        </template>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </el-row>
+    <el-dialog :visible.sync="formulaProp" append-to-body :close-on-click-modal="false" :title="propTitle" width="520px" @close="beforeClose">
+      <el-form ref="formulaRefForm" :inline="true" :model="formulaForm" size="small" label-width="85px">
+        <el-form-item v-if="operation !== 'editChild'" label="QA分类" prop="scriptOrganizeName" :rules="{ required: true, message: '请选择或新建分类' }">
+          <el-select
+            v-if="operation != 'edit'"
+            v-model="formulaForm.scriptOrganizeName"
+            filterable
+            allow-create
+            default-first-option
+            clearable
+            placeholder="请选择或新建分类"
+          >
+            <el-option
+              v-for="item in formulaList"
+              :key="item.id"
+              :label="item.scriptOrganizeName"
+              :value="item.id"
+            />
+          </el-select>
+          <el-input v-else v-model="formulaForm.scriptOrganizeName" placeholder="请输入分组名" />
+        </el-form-item>
+        <div v-show="operation !== 'edit'">
+          <div v-for="(item, index) in formulaForm.scriptTemplateList" :key="index">
+            <div class="group-item">话术{{ index + 1 }}</div>
+            <el-form-item :prop="`scriptTemplateList[${index}].question`" :rules="{ required: true, message: '请输入QA问题' }">
+              <span slot="label">QA问题</span>
+              <el-input v-model="item.question" placeholder="请输入QA问题" style="width: 340px" />
+            </el-form-item>
+            <el-form-item :prop="`scriptTemplateList[${index}].answer`" :rules="{ required: true, message: '请输入问题解答' }">
+              <span slot="label">问题解答</span>
+              <el-input v-model="item.answer" type="textarea" :autosize="{ minRows: 3, maxRows: 6}" placeholder="请输入问题解答" maxlength="250" style="width: 340px" />
+              <el-button v-show="index != 0" type="danger" icon="el-icon-delete" circle class="ml-5" @click="delGroup(index)" />
+            </el-form-item>
+          </div>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer u-flex u-flex-between">
+        <div>
+          <el-button v-if="operation == 'add'" type="primary" icon="el-icon-plus" @click="addGroup">新增QA</el-button>
+        </div>
+        <div>
+          <el-button type="text" @click="formulaProp = false">取消</el-button>
+          <el-button
+            :loading="subloading"
+            type="primary"
+            @click="hankShiftSave"
+          >确认</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { setScriptAdd, getQueryOrganize, setScriptUpdate, setScriptDel, setScriptOrganizeUpdate, addTopScript } from '@/api/index'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import { mapGetters } from 'vuex'
+const defaultForm = { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 'false', roles: [], jobs: [], dept: { id: null }, phone: null }
+export default {
+  name: 'FormulaIndex',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '话术管理', url: 'api-management/api/script/organize/queryAll' })
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      formulaList: [],
+      formulaProp: false,
+      operation: 'add',
+      subloading: false,
+      formulaForm: {
+        scriptOrganizeName: '',
+        scriptTemplateList: [
+          {
+            question: '',
+            answer: ''
+          }
+        ]
+      },
+      inputshow: false,
+      propTitle: '新增话术',
+      topScript: '',
+      topInputScript: ''
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'user'
+    ])
+  },
+  watch: {
+    'crud.data': {
+      handler(newVal, oldV) {
+        this.topScript = newVal.top.answer
+      },
+      deep: true
+    }
+  },
+  created() {},
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  methods: {
+    changevisible(v) {
+      this.userKey = Math.ceil(Math.random() * 100)
+    },
+    operationFun(obj = {}) {
+      const { type = '', data = {}} = obj
+      switch (type) {
+        case 'add':
+          this.propTitle = '新增话术'
+          break
+        case 'edit':
+        case 'editChild':
+          this.propTitle = '编辑话术'
+          break
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      getQueryOrganize({ userId: this.user.id }).then(res => {
+        this.formulaList = res.data.organize
+        this.operation = type
+        this.formulaProp = true
+        loading.close()
+        if (type === 'edit') {
+          this.formulaForm = Object.assign({}, data)
+        } else if (type === 'editChild') {
+          this.formulaForm.scriptTemplateList = [Object.assign({}, data)]
+        }
+      }).catch(() => {
+        loading.close()
+      })
+    },
+    // 新增小组
+    addGroup() {
+      this.formulaForm.scriptTemplateList.push({
+        title: '',
+        answer: ''
+      })
+    },
+    delGroup(index) {
+      this.formulaForm.scriptTemplateList.splice(index, 1)
+    },
+    showTopScript() {
+      this.topInputScript = this.topScript
+      this.inputshow = true
+    },
+    addTopScript() {
+      addTopScript({ answer: this.topInputScript }).then(res => {
+        this.topScript = this.topInputScript
+        this.$message.success('设置成功')
+        this.inputshow = false
+      })
+    },
+    // 改变状态
+    changeEnabled(data, val) {
+      this.$confirm('此操作将修改' + data.scriptOrganizeName + '的状态, 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        setScriptOrganizeUpdate({ status: val, id: data.id }).then(res => {
+          this.crud.notify('成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        }).catch(() => {
+          data.status = !data.status
+        })
+      }).catch(() => {
+        data.status = !data.status
+      })
+    },
+    hankShiftSave() {
+      this.$refs.formulaRefForm.validate(async(valid) => {
+        if (valid) {
+          const data = Object.assign({}, this.formulaForm)
+          if (this.operation === 'add') {
+            data.scriptOrganizeId = ''
+            if (typeof data.scriptOrganizeName === 'number') {
+              data.id = data.scriptOrganizeName
+              data.scriptOrganizeName = ''
+            }
+            setScriptAdd(data).then(res => {
+              if (res.status === 0) {
+                this.crud.toQuery()
+              }
+              this.formulaProp = false
+            })
+          }
+          if (this.operation === 'edit') {
+            const res = await setScriptOrganizeUpdate(data)
+            this.formulaProp = false
+            if (res.status === 0) {
+              this.crud.toQuery()
+            }
+          }
+          if (this.operation === 'editChild') {
+            const res = await setScriptUpdate(data.scriptTemplateList[0])
+            this.formulaProp = false
+            if (res.status === 0) {
+              this.crud.toQuery()
+            }
+          }
+        }
+      })
+    },
+    // 删除
+    delformula(id) {
+      this.$confirm('请确定要删除话术吗', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          setScriptDel(id).then(res => {
+            this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+            this.crud.toQuery()
+          })
+        })
+        .catch(() => {})
+    },
+    beforeClose() {
+      this.$refs.formulaRefForm.resetFields()
+      const data = {
+        scriptOrganizeName: '',
+        scriptTemplateList: [
+          {
+            question: '',
+            answer: ''
+          }
+        ]
+      }
+      this.formulaForm = data
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .group-item {
+    width: 80px;
+    line-height: 32px;
+    float: none;
+    display: inline-block;
+    color: #FFAA00;
+    text-align: left;
+    vertical-align: middle;
+    padding: 0 12px 0 0;
+    font-weight: bold;
+    position: relative;
+    &::before {
+      content: "";
+      border-left: 3px solid #FFAA00;
+      margin-right: 4px;
+      border-radius: 10px;
+    }
+  }
+  .c-red {
+    color: rgb(245, 108, 108);
+  }
+  .content-end {
+    display: inline-block;
+    min-width: 350px;
+    max-width: 600px;
+    padding: 7px 5px 0px;
+    background: #fafafa!important;
+    border: 1px solid #f0f0f0;
+    border-radius: 4px;
+    font-style: normal;
+    font-weight: 500;
+    font-size: 12px;
+    color: #333;
+    word-wrap: break-word
+    // display: flex;
+    // justify-content: space-between;
+    // align-items: center;
+    // flex-wrap: wrap;
+  }
+  .textarea{
+    max-width: 600px;
+  }
+</style>
diff --git a/src/views/adminGroup/group/index.vue b/src/views/adminGroup/group/index.vue
index 7e7e3a4..7fda83b 100644
--- a/src/views/adminGroup/group/index.vue
+++ b/src/views/adminGroup/group/index.vue
@@ -1,551 +1,551 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--用户数据-->
-      <!--工具栏-->
-      <div class="head-container">
-        <div>
-          <!-- 搜索 -->
-          <label class="y-label">小组名称：</label>
-          <el-input
-            v-model="query.blurry"
-            clearable
-            size="small"
-            placeholder="请输入"
-            style="width: 170px;"
-            class="filter-item"
-            @keyup.enter.native="crud.toQuery"
-          />
-          <rrOperation />
-        </div>
-        <div class="crud-opts">
-          <span class="crud-opts-left">
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="primary"
-              icon="el-icon-plus"
-              @click="operationFun({type: 'add'})"
-            >
-              新增
-            </el-button>
-          </span>
-        </div>
-      </div>
-      <!--表格渲染-->
-      <el-table ref="tables" v-loading="crud.loading" :data="crud.data" style="width: 100%;" row-key="id" :header-cell-style="{'text-align':'left'}" :tree-props="{children: 'userMapList', hasChildren: 'hasChildren'}" @selection-change="crud.selectionChangeHandler">
-        <el-table-column :show-overflow-tooltip="true" prop="organizeName" label="小组名" />
-        <el-table-column :show-overflow-tooltip="true" label="组长">
-          <template slot-scope="scope">
-            <div>{{ scope.row.userNickName ? scope.row.userNickName : scope.row.nickName }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" label="角色">
-          <template slot-scope="scope">
-            <el-tag size="medium" :type="scope.row.userNickName ? '' : 'warning'">{{ scope.row.userNickName ? '组长' : '呼叫业务员' }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="callMode" label="呼叫方式">
-          <template slot-scope="scope">
-            <span>{{ scope.row.callMode == 0 ? '双呼' : scope.row.callMode == 1 ? '点呼' : scope.row.callMode == 2 ? 'AXB' : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作"
-          width="140"
-          fixed="right"
-        >
-          <template slot-scope="scope">
-            <el-button
-              v-if="scope.row.userNickName"
-              class="filter-item"
-              size="mini"
-              type="text"
-              @click.stop="operationFun({type: 'edit', data: scope.row})"
-            >
-              修改
-            </el-button>
-            <el-button
-              slot="reference"
-              class="filter-item"
-              type="text"
-              size="mini"
-              @click.stop="setShift(scope.row)"
-            >
-              转移
-            </el-button>
-          </template>
-        </el-table-column>
-        <template #empty>
-          <div style="width: 100%; height: 450px;display: flex; flex-direction: column; justify-content: center;align-items: center">
-            <img src="@/assets/images/zanwu.png" alt="">
-            <div>暂无数据</div>
-          </div>
-        </template>
-      </el-table>
-      <el-dialog :visible.sync="groudProup" append-to-body :close-on-click-modal="false" :before-close="cancelCU" :title="propTitle" width="520px">
-        <el-form ref="form" :inline="true" :model="form" size="small" label-width="85px">
-          <div v-for="(item, index) in form.organizeList" :key="index" class="group-conent">
-            <div class="group-item">小组{{ index + 1 }}</div>
-            <el-form-item label="小组名称" :prop="`organizeList[${index}].organizeName`" :rules="{ required: true, message: '请输入小组名', trigger: 'blur' }">
-              <el-input v-model="item.organizeName" :readonly="operation == 'del'" style="width: 340px" />
-            </el-form-item>
-            <el-form-item label="呼叫方式" :prop="`organizeList[${index}].callMode`" :rules="{ required: true, message: '请选择呼叫方式', trigger: 'blur' }">
-              <el-select
-                :key="userKey"
-                v-model="item.callMode"
-                style="width: 340px"
-                prop-title
-                placeholder="请选择呼叫方式"
-                @change="changevisible"
-              >
-                <el-option
-                  v-for="it in callModeList"
-                  :key="it.id"
-                  :label="it.name"
-                  :value="it.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="组长" :prop="`organizeList[${index}].userId`" :rules="{ required: true, message: '请选择组长', trigger: 'blur' }">
-              <el-select
-                v-model="item.userId"
-                style="width: 340px"
-                filterable
-                placeholder="请选择组长"
-              >
-                <el-option
-                  v-for="it in userList"
-                  :key="it.id"
-                  :label="it.nickName"
-                  :value="it.id"
-                />
-              </el-select>
-              <el-button v-if="index != 0" type="danger" icon="el-icon-delete" circle class="ml-5" @click="delGroup(index)" />
-            </el-form-item>
-            <el-form-item :prop="`organizeList[${index}].isEnabled`">
-              <span slot="label" class="u-flex">
-                <span>
-                  组员线索
-                </span>
-                <el-tooltip class="item" effect="dark" content="组长获得该组下所有组员线索，谨慎开启" placement="top-start">
-                  <i class="el-icon-warning" />
-                </el-tooltip>
-              </span>
-              <el-switch v-model="item.isEnabled" active-color="#246FDC" />
-            </el-form-item>
-          </div>
-        </el-form>
-        <div slot="footer" class="dialog-footer u-flex u-flex-between">
-          <div>
-            <el-button v-if="operation == 'add'" type="primary" icon="el-icon-plus" @click="addGroup">新增小组</el-button>
-          </div>
-          <div>
-            <el-button type="text" @click="cancelCU">取消</el-button>
-            <el-button
-              :loading="subloading"
-              type="primary"
-              @click="groudSave"
-            >确认</el-button>
-          </div>
-        </div>
-      </el-dialog>
-      <el-dialog :visible.sync="shiftProp" append-to-body :close-on-click-modal="false" title="人员转移" width="520px" @close="shiftPropClose">
-        <el-form ref="shiftRefForm" :inline="true" :model="shiftForm" size="small" label-width="85px">
-          <el-form-item label="转移方式">
-            <el-radio-group v-model="shiftForm.wayType" :disabled="shiftForm.type === 2">
-              <el-radio label="1">替换人员</el-radio>
-              <el-radio label="2">转移到组</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="shiftForm.wayType == 1" label="替换人员" prop="replaceUserId" :rules="{ required: true, message: '请选择替换人员', trigger: 'blur' }">
-            <treeselect
-              v-model="shiftForm.replaceUserId"
-              :options="userOptions"
-              :disable-branch-nodes="true"
-              search-nested
-              searchable
-              no-options-text="暂无数据"
-              placeholder="选择替换人员"
-              style="width: 340px"
-            />
-          </el-form-item>
-          <el-form-item v-if="shiftForm.wayType == 2" label="组选择" prop="organizeId" :rules="{ required: true, message: '请选择组', trigger: 'blur' }">
-            <el-select
-              v-model="shiftForm.organizeId"
-              style="width: 340px"
-              placeholder="请选择组"
-            >
-              <el-option
-                v-for="it in crud.data"
-                :key="it.id"
-                :label="it.organizeName"
-                :value="it.id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="shiftForm.wayType == 2" label="职位选择" prop="roleLevel" :rules="{ required: true, message: '请选择职位', trigger: 'blur' }">
-            <el-select
-              v-model="shiftForm.roleLevel"
-              style="width: 340px"
-              placeholder="请选择职位"
-            >
-              <el-option key="9" label="组长" value="9" />
-              <el-option key="5" label="组员" value="5" />
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <div>
-            <el-button type="text" @click="shiftProp = false">取消</el-button>
-            <el-button
-              :loading="subloading"
-              type="primary"
-              @click="hankShiftSave"
-            >确认</el-button>
-          </div>
-        </div>
-      </el-dialog>
-      <!--分页组件-->
-      <pagination />
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { organizeSave, organizeEdit, queryIdenticalTask } from '@/api/system/groud'
-import { selectMemberList, organizeConvert } from '@/api/index'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import { mapGetters } from 'vuex'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-const defaultForm = { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 'false', roles: [], jobs: [], dept: { id: null }, phone: null }
-export default {
-  name: 'GroupIndex',
-  components: { rrOperation, pagination, Treeselect },
-  cruds() {
-    return CRUD({ title: '小组管理', url: 'api-management/api/organize/queryUserAll' })
-  },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  data() {
-    return {
-      height: document.documentElement.clientHeight - 180 + 'px;',
-      groudProup: false, // 组管理
-      shiftProp: false, // 人员转移
-      shiftId: '', // 被转移人员
-      userList: [], // 人员
-      shiftForm: {
-        wayType: '1',
-        userId: '', // 被替换人员id
-        organizeId: '', // 小组id
-        roleLevel: '', // 职位 9:组长 5：组员
-        replaceUserId: null // 替换人id
-      },
-      userOptions: '',
-      form: {
-        organizeList: [{
-          organizeName: '',
-          userId: '',
-          callMode: '',
-          isEnabled: false
-        }]
-      },
-      userKey: '',
-      callModeList: [
-        {
-          name: '双呼',
-          id: 0
-        },
-        {
-          name: '点呼',
-          id: 1
-        }
-        // {
-        //   name: 'AXB',
-        //   id: 2
-        // }
-      ],
-      btStatus: false, // 1弹框保存
-      operation: 'add',
-      lineChartData: [],
-      subloading: false, // 提交loading
-      propTitle: ''// title
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'user'
-    ])
-  },
-  created() {},
-  mounted: function() {
-    const that = this
-    window.onresize = function temp() {
-      that.height = document.documentElement.clientHeight - 180 + 'px;'
-    }
-  },
-  methods: {
-    changevisible(v) {
-      this.userKey = Math.ceil(Math.random() * 100)
-    },
-    // 组员转移
-    setShift(data) {
-      this.loadUser()
-      this.shiftForm.type = data.userNickName ? 2 : 1
-      this.shiftForm.userId = data.userId || data.id
-      this.shiftProp = true
-    },
-    // 人员转移
-    hankShiftSave() {
-      this.$refs.shiftRefForm.validate(valid => {
-        if (valid) {
-          this.subloading = true
-          this.userOptions.forEach((item, index) => {
-            if (item.children.findIndex(it => it.id === this.shiftForm.replaceUserId) !== -1) {
-              this.shiftForm.organizeId = item.id
-            }
-          })
-          organizeConvert(this.shiftForm).then(res => {
-            this.subloading = false
-            this.shiftProp = false
-            this.crud.toQuery()
-          }).catch(() => {
-            this.subloading = false
-          })
-        }
-      })
-    },
-    shiftPropClose() {
-      this.shiftForm = {
-        wayType: '1',
-        userId: '', // 被替换人员id
-        organizeId: '', // 小组id
-        roleLevel: '', // 职位 9:组长 5：组员
-        replaceUserId: null // 替换人id
-      }
-    },
-    loadUser() {
-      // selectAllOrganizeUser().then(res => {
-      //   var arr = []
-      //   let index = 0
-      //   for (const t in res) {
-      //     const obj = {}
-      //     obj.label = t
-      //     obj.id = index
-      //     obj.children = res[t]
-      //     arr.push(obj)
-      //     index++
-      //   }
-      //   this.userOptions = arr
-      // })
-      var arr = []
-      this.crud.data.forEach(item => {
-        const obj = {}
-        obj.label = item.organizeName
-        obj.id = item.id
-        const children = [
-          {
-            id: item.userId,
-            label: item.userNickName
-          }
-        ]
-        item.userMapList.forEach(it => {
-          children.push(
-            {
-              id: it.id,
-              label: it.nickName
-            }
-          )
-        })
-        obj.children = children
-        arr.push(obj)
-      })
-      this.userOptions = arr
-    },
-    operationFun(obj = {}) {
-      const { type = '', data = {}} = obj
-      const params = {
-        page: 0,
-        size: 100
-      }
-      switch (type) {
-        case 'add':
-          this.propTitle = '新增小组'
-          break
-        case 'edit':
-          this.propTitle = '编辑小组'
-          break
-        case 'del':
-          this.propTitle = '组长移交'
-          break
-      }
-      const loading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      selectMemberList(params).then(res => {
-        this.userList = res
-        this.groudProup = true
-        this.operation = type
-        loading.close()
-        if (type === 'edit' || type === 'del') {
-          this.orgEdit(data)
-        }
-      }).catch(() => {
-        loading.close()
-      })
-    },
-    // 编辑小组
-    orgEdit(data) {
-      console.log('data==', data)
-      this.userList.push({ nickName: data.userNickName, id: data.userId })
-      this.form.organizeList[0].organizeName = data.organizeName
-      this.form.organizeList[0].userId = data.userId
-      this.form.organizeList[0].callMode = data.callMode
-      this.form.organizeList[0].isEnabled = data.isEnabled
-      this.form.id = data.id
-      console.log('organizeList==', this.form.organizeList)
-    },
-    groudSave() {
-      this.btStatus = true
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          const arr = this.form.organizeList.map(it => { return it.userId })
-          if ((new Set(arr)).size !== this.form.organizeList.length) {
-            this.$message({
-              message: '组长不能重复选择',
-              type: 'warning'
-            })
-            return false
-          }
-          if (this.operation === 'add') {
-            this.organizeSave(this.form.organizeList)
-          } else if (this.operation === 'edit') {
-            const obj = {
-              organizeName: this.form.organizeList[0].organizeName,
-              userId: this.form.organizeList[0].userId,
-              id: this.form.id,
-              callMode: this.form.organizeList[0].callMode,
-              isEnabled: this.form.organizeList[0].isEnabled
-            }
-            this.organizeEdit(obj)
-          } else if (this.operation === 'del') {
-            this.queryIdenticalTask(this.form.id)
-          }
-        }
-      })
-    },
-    // 新建小组
-    organizeSave(data) {
-      this.subloading = true
-      organizeSave(data).then(res => {
-        this.btStatus = false
-        this.subloading = false
-        this.$message({
-          type: 'success',
-          message: '操作成功!',
-          showClose: true
-        })
-        this.cancelCU()
-        this.crud.toQuery()
-      }).catch(() => {
-        this.subloading = false
-      })
-    },
-    // 编辑小组
-    organizeEdit(data) {
-      this.subloading = true
-      organizeEdit(data).then(res => {
-        this.btStatus = false
-        this.subloading = false
-        this.$message({
-          type: 'success',
-          message: '操作成功!',
-          showClose: true
-        })
-        this.cancelCU()
-        this.crud.refresh()
-      }).catch(() => {
-        this.subloading = false
-      })
-    },
-    delGroup(index) {
-      this.form.organizeList.splice(index, 1)
-    },
-    // 新增小组
-    addGroup() {
-      this.form.organizeList.push({
-        organizeName: '',
-        userId: ''
-      })
-    },
-    cancelCU() {
-      this.form.organizeList = []
-      this.form.organizeList.push({
-        organizeName: '',
-        userId: '',
-        callMode: '',
-        isEnabled: false
-      })
-      this.groudProup = false
-    },
-    // 改变状态
-    queryIdenticalTask(data) {
-      this.$confirm('确定要转移组长吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        queryIdenticalTask({ organizeId: data.id }).then(res => {
-          this.$notify({
-            title: '成功',
-            message: '操作成功',
-            type: 'success'
-          })
-          this.cancelCU()
-          this.crud.toQuery()
-        }).catch(() => {
-          this.$message.error('系统异常请重新操作')
-        })
-      }).catch(() => {})
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
-    height: 30px;
-    line-height: 30px;
-  }
-  .group-item {
-    width: 80px;
-    line-height: 32px;
-    float: none;
-    display: inline-block;
-    color: #FFAA00;
-    text-align: left;
-    vertical-align: middle;
-    padding: 0 12px 0 0;
-    font-weight: bold;
-    position: relative;
-    &::before {
-      content: "";
-      border-left: 3px solid #FFAA00;
-      margin-right: 4px;
-      border-radius: 10px;
-    }
-  }
-  .group-conent {
-    margin-top: -15px;
-  }
-</style>
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--用户数据-->
+      <!--工具栏-->
+      <div class="head-container">
+        <div>
+          <!-- 搜索 -->
+          <label class="y-label">小组名称：</label>
+          <el-input
+            v-model="query.blurry"
+            clearable
+            size="small"
+            placeholder="请输入"
+            style="width: 170px;"
+            class="filter-item"
+            @keyup.enter.native="crud.toQuery"
+          />
+          <rrOperation />
+        </div>
+        <div class="crud-opts">
+          <span class="crud-opts-left">
+            <el-button
+              class="filter-item"
+              size="mini"
+              type="primary"
+              icon="el-icon-plus"
+              @click="operationFun({type: 'add'})"
+            >
+              新增
+            </el-button>
+          </span>
+        </div>
+      </div>
+      <!--表格渲染-->
+      <el-table ref="tables" v-loading="crud.loading" :data="crud.data" style="width: 100%;" row-key="id" :header-cell-style="{'text-align':'left'}" :tree-props="{children: 'userMapList', hasChildren: 'hasChildren'}" @selection-change="crud.selectionChangeHandler">
+        <el-table-column :show-overflow-tooltip="true" prop="organizeName" label="小组名" />
+        <el-table-column :show-overflow-tooltip="true" label="组长">
+          <template slot-scope="scope">
+            <div>{{ scope.row.userNickName ? scope.row.userNickName : scope.row.nickName }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" label="角色">
+          <template slot-scope="scope">
+            <el-tag size="medium" :type="scope.row.userNickName ? '' : 'warning'">{{ scope.row.userNickName ? '组长' : '呼叫业务员' }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="callMode" label="呼叫方式">
+          <template slot-scope="scope">
+            <span>{{ scope.row.callMode == 0 ? '双呼' : scope.row.callMode == 1 ? '点呼' : scope.row.callMode == 2 ? 'AXB' : '' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          width="100"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.userNickName"
+              class="filter-item"
+              size="mini"
+              type="text"
+              @click.stop="operationFun({type: 'edit', data: scope.row})"
+            >
+              修改
+            </el-button>
+            <el-button
+              slot="reference"
+              class="filter-item"
+              type="text"
+              size="mini"
+              @click.stop="setShift(scope.row)"
+            >
+              转移
+            </el-button>
+          </template>
+        </el-table-column>
+        <template #empty>
+          <div style="width: 100%; height: 450px;display: flex; flex-direction: column; justify-content: center;align-items: center">
+            <img src="@/assets/images/zanwu.png" alt="">
+            <div>暂无数据</div>
+          </div>
+        </template>
+      </el-table>
+      <el-dialog :visible.sync="groudProup" append-to-body :close-on-click-modal="false" :before-close="cancelCU" :title="propTitle" width="520px">
+        <el-form ref="form" :inline="true" :model="form" size="small" label-width="85px">
+          <div v-for="(item, index) in form.organizeList" :key="index" class="group-conent">
+            <div class="group-item">小组{{ index + 1 }}</div>
+            <el-form-item label="小组名称" :prop="`organizeList[${index}].organizeName`" :rules="{ required: true, message: '请输入小组名', trigger: 'blur' }">
+              <el-input v-model="item.organizeName" :readonly="operation == 'del'" style="width: 340px" />
+            </el-form-item>
+            <el-form-item label="呼叫方式" :prop="`organizeList[${index}].callMode`" :rules="{ required: true, message: '请选择呼叫方式', trigger: 'blur' }">
+              <el-select
+                :key="userKey"
+                v-model="item.callMode"
+                style="width: 340px"
+                prop-title
+                placeholder="请选择呼叫方式"
+                @change="changevisible"
+              >
+                <el-option
+                  v-for="it in callModeList"
+                  :key="it.id"
+                  :label="it.name"
+                  :value="it.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="组长" :prop="`organizeList[${index}].userId`" :rules="{ required: true, message: '请选择组长', trigger: 'blur' }">
+              <el-select
+                v-model="item.userId"
+                style="width: 340px"
+                filterable
+                placeholder="请选择组长"
+              >
+                <el-option
+                  v-for="it in userList"
+                  :key="it.id"
+                  :label="it.nickName"
+                  :value="it.id"
+                />
+              </el-select>
+              <el-button v-if="index != 0" type="danger" icon="el-icon-delete" circle class="ml-5" @click="delGroup(index)" />
+            </el-form-item>
+            <el-form-item :prop="`organizeList[${index}].isEnabled`">
+              <span slot="label" class="u-flex">
+                <span>
+                  组员线索
+                </span>
+                <el-tooltip class="item" effect="dark" content="组长获得该组下所有组员线索，谨慎开启" placement="top-start">
+                  <i class="el-icon-warning" />
+                </el-tooltip>
+              </span>
+              <el-switch v-model="item.isEnabled" active-color="#246FDC" />
+            </el-form-item>
+          </div>
+        </el-form>
+        <div slot="footer" class="dialog-footer u-flex u-flex-between">
+          <div>
+            <el-button v-if="operation == 'add'" type="primary" icon="el-icon-plus" @click="addGroup">新增小组</el-button>
+          </div>
+          <div>
+            <el-button type="text" @click="cancelCU">取消</el-button>
+            <el-button
+              :loading="subloading"
+              type="primary"
+              @click="groudSave"
+            >确认</el-button>
+          </div>
+        </div>
+      </el-dialog>
+      <el-dialog :visible.sync="shiftProp" append-to-body :close-on-click-modal="false" title="人员转移" width="520px" @close="shiftPropClose">
+        <el-form ref="shiftRefForm" :inline="true" :model="shiftForm" size="small" label-width="85px">
+          <el-form-item label="转移方式">
+            <el-radio-group v-model="shiftForm.wayType" :disabled="shiftForm.type === 2">
+              <el-radio label="1">替换人员</el-radio>
+              <el-radio label="2">转移到组</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="shiftForm.wayType == 1" label="替换人员" prop="replaceUserId" :rules="{ required: true, message: '请选择替换人员', trigger: 'blur' }">
+            <treeselect
+              v-model="shiftForm.replaceUserId"
+              :options="userOptions"
+              :disable-branch-nodes="true"
+              search-nested
+              searchable
+              no-options-text="暂无数据"
+              placeholder="选择替换人员"
+              style="width: 340px"
+            />
+          </el-form-item>
+          <el-form-item v-if="shiftForm.wayType == 2" label="组选择" prop="organizeId" :rules="{ required: true, message: '请选择组', trigger: 'blur' }">
+            <el-select
+              v-model="shiftForm.organizeId"
+              style="width: 340px"
+              placeholder="请选择组"
+            >
+              <el-option
+                v-for="it in crud.data"
+                :key="it.id"
+                :label="it.organizeName"
+                :value="it.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="shiftForm.wayType == 2" label="职位选择" prop="roleLevel" :rules="{ required: true, message: '请选择职位', trigger: 'blur' }">
+            <el-select
+              v-model="shiftForm.roleLevel"
+              style="width: 340px"
+              placeholder="请选择职位"
+            >
+              <el-option key="9" label="组长" value="9" />
+              <el-option key="5" label="组员" value="5" />
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <div>
+            <el-button type="text" @click="shiftProp = false">取消</el-button>
+            <el-button
+              :loading="subloading"
+              type="primary"
+              @click="hankShiftSave"
+            >确认</el-button>
+          </div>
+        </div>
+      </el-dialog>
+      <!--分页组件-->
+      <pagination />
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { organizeSave, organizeEdit, queryIdenticalTask } from '@/api/system/groud'
+import { selectMemberList, organizeConvert } from '@/api/index'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import { mapGetters } from 'vuex'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+const defaultForm = { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 'false', roles: [], jobs: [], dept: { id: null }, phone: null }
+export default {
+  name: 'GroupIndex',
+  components: { rrOperation, pagination, Treeselect },
+  cruds() {
+    return CRUD({ title: '小组管理', url: 'api-management/api/organize/queryUserAll' })
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      groudProup: false, // 组管理
+      shiftProp: false, // 人员转移
+      shiftId: '', // 被转移人员
+      userList: [], // 人员
+      shiftForm: {
+        wayType: '1',
+        userId: '', // 被替换人员id
+        organizeId: '', // 小组id
+        roleLevel: '', // 职位 9:组长 5：组员
+        replaceUserId: null // 替换人id
+      },
+      userOptions: '',
+      form: {
+        organizeList: [{
+          organizeName: '',
+          userId: '',
+          callMode: '',
+          isEnabled: false
+        }]
+      },
+      userKey: '',
+      callModeList: [
+        {
+          name: '双呼',
+          id: 0
+        },
+        {
+          name: '点呼',
+          id: 1
+        }
+        // {
+        //   name: 'AXB',
+        //   id: 2
+        // }
+      ],
+      btStatus: false, // 1弹框保存
+      operation: 'add',
+      lineChartData: [],
+      subloading: false, // 提交loading
+      propTitle: ''// title
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'user'
+    ])
+  },
+  created() {},
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  methods: {
+    changevisible(v) {
+      this.userKey = Math.ceil(Math.random() * 100)
+    },
+    // 组员转移
+    setShift(data) {
+      this.loadUser()
+      this.shiftForm.type = data.userNickName ? 2 : 1
+      this.shiftForm.userId = data.userId || data.id
+      this.shiftProp = true
+    },
+    // 人员转移
+    hankShiftSave() {
+      this.$refs.shiftRefForm.validate(valid => {
+        if (valid) {
+          this.subloading = true
+          this.userOptions.forEach((item, index) => {
+            if (item.children.findIndex(it => it.id === this.shiftForm.replaceUserId) !== -1) {
+              this.shiftForm.organizeId = item.id
+            }
+          })
+          organizeConvert(this.shiftForm).then(res => {
+            this.subloading = false
+            this.shiftProp = false
+            this.crud.toQuery()
+          }).catch(() => {
+            this.subloading = false
+          })
+        }
+      })
+    },
+    shiftPropClose() {
+      this.shiftForm = {
+        wayType: '1',
+        userId: '', // 被替换人员id
+        organizeId: '', // 小组id
+        roleLevel: '', // 职位 9:组长 5：组员
+        replaceUserId: null // 替换人id
+      }
+    },
+    loadUser() {
+      // selectAllOrganizeUser().then(res => {
+      //   var arr = []
+      //   let index = 0
+      //   for (const t in res) {
+      //     const obj = {}
+      //     obj.label = t
+      //     obj.id = index
+      //     obj.children = res[t]
+      //     arr.push(obj)
+      //     index++
+      //   }
+      //   this.userOptions = arr
+      // })
+      var arr = []
+      this.crud.data.forEach(item => {
+        const obj = {}
+        obj.label = item.organizeName
+        obj.id = item.id
+        const children = [
+          {
+            id: item.userId,
+            label: item.userNickName
+          }
+        ]
+        item.userMapList.forEach(it => {
+          children.push(
+            {
+              id: it.id,
+              label: it.nickName
+            }
+          )
+        })
+        obj.children = children
+        arr.push(obj)
+      })
+      this.userOptions = arr
+    },
+    operationFun(obj = {}) {
+      const { type = '', data = {}} = obj
+      const params = {
+        page: 0,
+        size: 100
+      }
+      switch (type) {
+        case 'add':
+          this.propTitle = '新增小组'
+          break
+        case 'edit':
+          this.propTitle = '编辑小组'
+          break
+        case 'del':
+          this.propTitle = '组长移交'
+          break
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      selectMemberList(params).then(res => {
+        this.userList = res
+        this.groudProup = true
+        this.operation = type
+        loading.close()
+        if (type === 'edit' || type === 'del') {
+          this.orgEdit(data)
+        }
+      }).catch(() => {
+        loading.close()
+      })
+    },
+    // 编辑小组
+    orgEdit(data) {
+      console.log('data==', data)
+      this.userList.push({ nickName: data.userNickName, id: data.userId })
+      this.form.organizeList[0].organizeName = data.organizeName
+      this.form.organizeList[0].userId = data.userId
+      this.form.organizeList[0].callMode = data.callMode
+      this.form.organizeList[0].isEnabled = data.isEnabled
+      this.form.id = data.id
+      console.log('organizeList==', this.form.organizeList)
+    },
+    groudSave() {
+      this.btStatus = true
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          const arr = this.form.organizeList.map(it => { return it.userId })
+          if ((new Set(arr)).size !== this.form.organizeList.length) {
+            this.$message({
+              message: '组长不能重复选择',
+              type: 'warning'
+            })
+            return false
+          }
+          if (this.operation === 'add') {
+            this.organizeSave(this.form.organizeList)
+          } else if (this.operation === 'edit') {
+            const obj = {
+              organizeName: this.form.organizeList[0].organizeName,
+              userId: this.form.organizeList[0].userId,
+              id: this.form.id,
+              callMode: this.form.organizeList[0].callMode,
+              isEnabled: this.form.organizeList[0].isEnabled
+            }
+            this.organizeEdit(obj)
+          } else if (this.operation === 'del') {
+            this.queryIdenticalTask(this.form.id)
+          }
+        }
+      })
+    },
+    // 新建小组
+    organizeSave(data) {
+      this.subloading = true
+      organizeSave(data).then(res => {
+        this.btStatus = false
+        this.subloading = false
+        this.$message({
+          type: 'success',
+          message: '操作成功!',
+          showClose: true
+        })
+        this.cancelCU()
+        this.crud.toQuery()
+      }).catch(() => {
+        this.subloading = false
+      })
+    },
+    // 编辑小组
+    organizeEdit(data) {
+      this.subloading = true
+      organizeEdit(data).then(res => {
+        this.btStatus = false
+        this.subloading = false
+        this.$message({
+          type: 'success',
+          message: '操作成功!',
+          showClose: true
+        })
+        this.cancelCU()
+        this.crud.refresh()
+      }).catch(() => {
+        this.subloading = false
+      })
+    },
+    delGroup(index) {
+      this.form.organizeList.splice(index, 1)
+    },
+    // 新增小组
+    addGroup() {
+      this.form.organizeList.push({
+        organizeName: '',
+        userId: ''
+      })
+    },
+    cancelCU() {
+      this.form.organizeList = []
+      this.form.organizeList.push({
+        organizeName: '',
+        userId: '',
+        callMode: '',
+        isEnabled: false
+      })
+      this.groudProup = false
+    },
+    // 改变状态
+    queryIdenticalTask(data) {
+      this.$confirm('确定要转移组长吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        queryIdenticalTask({ organizeId: data.id }).then(res => {
+          this.$notify({
+            title: '成功',
+            message: '操作成功',
+            type: 'success'
+          })
+          this.cancelCU()
+          this.crud.toQuery()
+        }).catch(() => {
+          this.$message.error('系统异常请重新操作')
+        })
+      }).catch(() => {})
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
+    height: 30px;
+    line-height: 30px;
+  }
+  .group-item {
+    width: 80px;
+    line-height: 32px;
+    float: none;
+    display: inline-block;
+    color: #FFAA00;
+    text-align: left;
+    vertical-align: middle;
+    padding: 0 12px 0 0;
+    font-weight: bold;
+    position: relative;
+    &::before {
+      content: "";
+      border-left: 3px solid #FFAA00;
+      margin-right: 4px;
+      border-radius: 10px;
+    }
+  }
+  .group-conent {
+    margin-top: -15px;
+  }
+</style>
diff --git a/src/views/advertisement/advertisementList.vue b/src/views/advertisement/advertisementList.vue
new file mode 100644
index 0000000..7fa855b
--- /dev/null
+++ b/src/views/advertisement/advertisementList.vue
@@ -0,0 +1,368 @@
+<template>
+  <div>
+    <div class="u-flex" style="align-items: normal">
+      <div class="app-container flex-1" style="margin-bottom: 0;margin-right: 10px;">
+        <div class="margin-auto">
+          <el-upload
+            ref="updaatefilesTo"
+            accept=".xls,.xlsx"
+            drag
+            :action="fileUpload"
+            multiple
+            :limit="5"
+            :file-list="fileList"
+            :auto-upload="false"
+            :on-remove="handleRemove"
+            :on-exceed="handleExceed"
+            :http-request="updtaFils"
+          >
+            <i class="el-icon-upload" />
+            <div class="el-upload__text">
+              将文件拖到此处，或<em>点击上传</em>
+            </div>
+            <div slot="tip" class="el-upload__tip">
+              只能上传.xls，.xlsx文件，且不超过100M
+            </div>
+          </el-upload>
+          <div class="line-text">
+            <div class="mb-10 u-flex">
+              <label>任务名称：</label>
+              <div class="u-flex">
+                <el-input v-model="taskValue" clearable />
+              </div>
+            </div>
+            <div class="mb-10 u-flex">
+              <label>方式类型：</label>
+              <el-select v-model="uploadType" size="small" class="filter-item" clearable placeholder="请选择状态">
+                <el-option v-for="(item, index) in uploadTypeList" :key="index" :label="item.key" :value="item.value" />
+              </el-select>
+            </div>
+          </div>
+          <div>
+            <el-button
+              type="primary"
+              class="mt-10"
+              :loading="uploading"
+              @click="submitUpload({ ref: 'updaatefilesTo' })"
+            >上传资源</el-button>
+            <el-button
+              type="text"
+              class="mt-10"
+              @click="resettingUpdate"
+            >重置</el-button>
+          </div>
+        </div>
+      </div>
+      <div class="app-container flex-1" style="margin-bottom: 0;margin-left: 10px;">
+        <a href="https://business.oceanengine.com" target="_blank">跳转巨量平台<i class="el-icon-s-promotion" /></a>
+        <advertisingQualityscore v-if="JSON.stringify(advertisingQualityScoreData) !== '{}'" :series-value="advertisingQualityScoreData" />
+      </div>
+    </div>
+    <div class="app-container">
+      <el-row :gutter="20">
+        <!--工具栏-->
+        <div class="head-container">
+          <!-- 搜索 -->
+          <date-range-picker v-model="query.createTime" class="date-item" />
+          <el-input
+            v-model="query.taskName"
+            clearable
+            size="small"
+            placeholder="输入任务名"
+            style="width: 200px;"
+            class="filter-item"
+            @keyup.enter.native="crud.toQuery"
+          />
+          <el-select v-model="query.recordStatus" size="small" class="filter-item" style="width: 130px" clearable placeholder="请选择状态" @change="crud.toQuery">
+            <el-option v-for="(item, index) in statusList" :key="index" :label="item.key" :value="item.value" />
+          </el-select>
+          <rrOperation />
+        </div>
+        <!--表格渲染-->
+        <el-table
+          ref="table"
+          v-loading="crud.loading"
+          :data="crud.data"
+          :header-cell-style="{ 'text-align': 'left' }"
+          style="width: 100%;"
+        >
+          <el-table-column :show-overflow-tooltip="true" prop="id" label="ID" width="35" />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="taskName"
+            label="任务名"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="uploadNum"
+            label="上传数量"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="analysisNum"
+            label="解析数量"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="payTime"
+            width="135"
+            label="上传时间"
+          >
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="payTime"
+            width="110"
+            label="发送类型"
+          >
+            <template slot-scope="scope">
+              <span>{{ statecCmparison('uploadTypeList', scope.row.recordType) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="recordStatus"
+            width="110"
+            label="状态"
+          >
+            <template slot-scope="scope">
+              <span>{{ statecCmparison('statusList', scope.row.recordStatus) }}</span>
+            </template>
+          </el-table-column>
+          <template #empty>
+            <div style="width: 100%; height: 450px;display: flex; flex-direction: column; justify-content: center;align-items: center">
+              <img src="@/assets/images/zanwu.png" alt="">
+              <div>暂无数据</div>
+            </div>
+          </template>
+        </el-table>
+        <!--分页组件-->
+        <pagination />
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker'
+import { getAdvertisingQualityScore } from '@/api/login.js'
+import advertisingQualityscore from '@/components/Echarts/Radar'
+import {
+  modeUploadFiles
+} from '@/api/index'
+import { mapGetters } from 'vuex'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+const defaultForm = {}
+export default {
+  name: 'AdvertisementList',
+  components: { rrOperation, pagination, DateRangePicker, advertisingQualityscore },
+  cruds() {
+    return CRUD({
+      title: '广告建模',
+      url: '/api-management/api/mode/record',
+      crudMethod: {}
+    })
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {
+        add: ['admin', 'user:add'],
+        edit: ['admin', 'user:edit'],
+        del: ['admin', 'user:del'],
+        download: ['admin', 'user:download']
+      },
+      fileList: [], // files集合
+      taskValue: '',
+      uploadType: '',
+      uploading: false,
+      uploadTypeList: [
+        {
+          key: '方式一',
+          value: '0'
+        },
+        {
+          key: '方式二',
+          value: '1'
+        },
+        {
+          key: '方式三',
+          value: '2'
+        }
+      ],
+      statusList: [
+        {
+          key: '上传失败',
+          value: '-1'
+        },
+        {
+          key: '上传中',
+          value: '0'
+        },
+        {
+          key: '上传成功',
+          value: '1'
+        },
+        {
+          key: '建模中',
+          value: '2'
+        },
+        {
+          key: '建模成功',
+          value: '3'
+        }
+      ],
+      advertisingQualityScoreData: {} // 充值记录模块消费统计柱状图
+    }
+  },
+  computed: {
+    ...mapGetters(['user', 'fileUpload'])
+  },
+  created() {
+    this.getAdvertisingQualityScoreData()
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  methods: {
+    // 获取广告质量分
+    async getAdvertisingQualityScoreData() {
+      const res = await getAdvertisingQualityScore()
+      if (res.status === 0) {
+        this.advertisingQualityScoreData = res.data
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 上传
+    updtaFils(file) {
+      this.fileData.append('file', file.file)
+    },
+    // 移除
+    handleRemove(file, fileList) {
+      this.fileList = fileList
+    },
+    // 选取文件超过数量提示
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 5 个文件，本次选择了 ${
+          files.length
+        } 个文件，共选择了 ${files.length + fileList.length} 个文件`
+      )
+    },
+    submitUpload({ ref }) {
+      if (this.taskValue === '') {
+        this.$message({
+          message: '请输入任务名',
+          type: 'warning'
+        })
+      } else if (this.uploadType === '') {
+        this.$message({
+          message: '请选择方式类型',
+          type: 'warning'
+        })
+      } else {
+        const isLt100M = this.fileList.every(
+          file => file.size / 1024 / 1024 < 100
+        )
+        if (!isLt100M) {
+          this.$message.warning('请检查，上传文件大小不能超过100MB!')
+        } else {
+          this.fileData = new FormData() // new formData对象
+          this.$refs[ref].submit()
+          if (!this.fileData.get('file')) {
+            this.$message({
+              message: '请先选择文件',
+              type: 'warning'
+            })
+            return false
+          }
+          this.fileData.append('taskName', this.taskValue)
+          this.fileData.append('uploadType', this.uploadType)
+          this.uploading = true
+          modeUploadFiles(this.fileData)
+            .then(res => {
+              if (res.status === 0) {
+                this.$message({
+                  message: '操作成功，文件上传中...',
+                  type: 'success'
+                })
+                this.crud.resetQuery()
+                this.resettingUpdate()
+              } else {
+                this.$message({
+                  message: res.data.desc,
+                  type: 'error'
+                })
+              }
+              this.uploading = false
+            })
+            .catch(() => {
+              this.uploading = false
+            })
+        }
+      }
+    },
+    resettingUpdate() {
+      this.fileList = []
+      this.taskValue = ''
+      this.uploadType = ''
+    },
+    // 下载模板
+    downFilex({ type }) {
+      // downLoadTemplate({ downLoadType: type }).then(res => {
+      //   window.location.href = res
+      // })
+    },
+    statecCmparison(name, val) {
+      return this[name].filter(item => { return Number(item.value) === val })[0].key
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .vue-treeselect__control,
+::v-deep .vue-treeselect__placeholder,
+::v-deep .vue-treeselect__single-value {
+  height: 30px;
+  line-height: 30px;
+}
+::v-deep .el-dialog__body {
+  padding: 20px;
+}
+.date-item {
+  width: 230px !important;
+}
+//弹出框日期label样式
+::v-deep .y-label {
+  vertical-align: unset;
+  min-width: unset;
+}
+//分页
+.el-pagination {
+  text-align: right;
+}
+.line-text {
+  font-size: 14px;
+  color: #606266;
+  line-height: 21px;
+  margin-top: 10px;
+}
+.chart {
+  padding: 0px;
+}
+a {
+  color: #246fdc;
+}
+</style>
diff --git a/src/views/advertisement/manageIndex.vue b/src/views/advertisement/manageIndex.vue
new file mode 100644
index 0000000..28076e5
--- /dev/null
+++ b/src/views/advertisement/manageIndex.vue
@@ -0,0 +1,235 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--工具栏-->
+      <div class="head-container">
+        <div>
+          <!-- 搜索 -->
+          <date-range-picker v-model="query.createTime" class="date-item" />
+          <el-input
+            v-model="query.taskName"
+            clearable
+            size="small"
+            placeholder="输入任务名"
+            style="width: 200px;"
+            class="filter-item"
+            @keyup.enter.native="crud.toQuery"
+          />
+          <!-- <el-select v-model="value" size="small" class="filter-item" style="width: 110px" clearable placeholder="请选择状态" @change="crud.toQuery">
+            <el-option :value="0">等待建模</el-option>
+            <el-option :value="1">建模成功</el-option>
+          </el-select> -->
+          <rrOperation />
+        </div>
+      </div>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        :header-cell-style="{ 'text-align': 'left' }"
+        style="width: 100%;"
+      >
+        <el-table-column :show-overflow-tooltip="true" prop="id" label="ID" width="35" />
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="taskName"
+          label="任务名"
+        />
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="uploadNum"
+          label="上传数量"
+        />
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="analysisNum"
+          label="解析数量"
+        />
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="payTime"
+          width="135"
+          label="上传时间"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="payTime"
+          width="110"
+          label="发送类型"
+        >
+          <template slot-scope="scope">
+            <span>{{ statecCmparison('uploadTypeList', scope.row.recordType) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="recordStatus"
+          width="110"
+          label="状态"
+        >
+          <template slot-scope="scope">
+            <span>{{ statecCmparison('statusList', scope.row.recordStatus) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          width="75"
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <el-button
+              slot="reference"
+              size="mini"
+              type="text"
+              :disabled="scope.row.recordStatus !== 1"
+              @click="openModeling(scope.row.id)"
+            >建模</el-button>
+          </template>
+        </el-table-column>
+        <template #empty>
+          <div style="width: 100%; height: 450px;display: flex; flex-direction: column; justify-content: center;align-items: center">
+            <img src="@/assets/images/zanwu.png" alt="">
+            <div>暂无数据</div>
+          </div>
+        </template>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </el-row>
+    <el-dialog title="建模创建" :visible.sync="dialogFormVisible" width="420px" @close="closeDialog">
+      <el-form ref="refForm" :model="modelingForm">
+        <el-form-item label="活动ID" prop="actId" :rules="[{ required: true, message: '请输入活动id'}]">
+          <el-input v-model="modelingForm.actId" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="活动名称" prop="actName" :rules="[{ required: true, message: '请输入活动名称'}]">
+          <el-input v-model="modelingForm.actName" autocomplete="off" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="recordBuildFun">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker'
+import {
+  recordBuild
+} from '@/api/index'
+import { mapGetters } from 'vuex'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+const defaultForm = {}
+export default {
+  name: 'ManageIndex',
+  components: { rrOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({
+      title: '建模管理',
+      url: 'api-management/api/mode/record',
+      crudMethod: {}
+    })
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {
+        add: ['admin', 'user:add'],
+        edit: ['admin', 'user:edit'],
+        del: ['admin', 'user:del'],
+        download: ['admin', 'user:download']
+      },
+      dialogFormVisible: false,
+      modelingForm: {
+        id: '',
+        actId: '',
+        actName: ''
+      },
+      uploadTypeList: [
+        {
+          key: '方式一',
+          value: '0'
+        },
+        {
+          key: '方式二',
+          value: '1'
+        },
+        {
+          key: '方式三',
+          value: '2'
+        }
+      ],
+      statusList: [
+        {
+          key: '上传失败',
+          value: '-1'
+        },
+        {
+          key: '上传中',
+          value: '0'
+        },
+        {
+          key: '上传成功',
+          value: '1'
+        },
+        {
+          key: '建模中',
+          value: '2'
+        },
+        {
+          key: '建模成功',
+          value: '3'
+        }
+      ]
+    }
+  },
+  computed: {
+    ...mapGetters(['user'])
+  },
+  created() {
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  methods: {
+    openModeling(id) {
+      this.modelingForm.id = id
+      this.dialogFormVisible = true
+    },
+    closeDialog() {
+      this.$refs.refForm.resetFields()
+    },
+    recordBuildFun() {
+      this.$refs.refForm.validate((valid) => {
+        if (valid) {
+          recordBuild(this.modelingForm).then(res => {
+            this.$message('操作成功')
+            this.dialogFormVisible = false
+          })
+        }
+      })
+    },
+    statecCmparison(name, val) {
+      return this[name].filter(item => { return Number(item.value) === val })[0].key
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding: 20px;
+}
+</style>
diff --git a/src/views/agentManagement/index.vue b/src/views/agentManagement/index.vue
index df08a0b..bcc4aeb 100644
--- a/src/views/agentManagement/index.vue
+++ b/src/views/agentManagement/index.vue
@@ -1,653 +1,653 @@
-<template>
-  <div class="app-container">
-    <!-- 检测指标 -->
-    <el-row class="detectQuantityArea">
-      <el-col
-        :span="6"
-        :offset="9"
-        style="border: 1px solid #dcdfe6; padding: 20px"
-      >
-        <div>
-          <div style="display: flex">
-            <span
-              class="quantityName"
-              style="margin-right: 130px"
-            >总代理商</span>
-            <i class="el-icon-warning-outline quantityName" />
-          </div>
-          <div class="keyQuantity">{{ statisticsData.totalNum }}</div>
-          <p>
-            <span
-              class="quantityName"
-              style="margin-right: 12px"
-            >本周新增</span>
-            <i class="el-icon-caret-top" style="color: #a4d783" />
-            <span style="margin-right: 12px">{{ statisticsData.weekNum }}</span>
-            <span
-              class="quantityName"
-              style="margin-right: 12px"
-            >昨日新增</span>
-            <i class="el-icon-caret-bottom" style="color: #e13c39" />
-            <!-- <span
-              class="quantityName"
-              style="margin-right: 12px"
-            >本周新增</span>
-            <i class="el-icon-caret-top" style="color: #a4d783" />
-            <span style="margin-right: 12px">{{ statisticsData.weekNum }}</span>
-            <span
-              class="quantityName"
-              style="margin-right: 12px"
-            >昨日新增</span>
-            <i class="el-icon-caret-bottom" style="color: #e13c39" /> -->
-            <span style="margin-right: 12px">{{ statisticsData.dayNum }}</span>
-          </p>
-        </div>
-      </el-col>
-    </el-row>
-    <!-- 工具栏、表格 -->
-    <el-row :gutter="20">
-      <!-- 工具栏 -->
-      <div class="head-container">
-        <!-- 左侧添加账号、批量禁用 -->
-        <crudOperation show="" :permission="permission" :is-show="true">
-          <template v-slot:right>
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="primary"
-              :disabled="selections.length === 0"
-              @click="batchActivation"
-            >批量开通</el-button>
-            <el-button
-              class="filter-item"
-              size="mini"
-              :disabled="selections.length === 0"
-              @click="batchDeletion"
-            >
-              批量禁用
-            </el-button>
-          </template>
-        </crudOperation>
-        <!-- 右侧搜索、筛选 -->
-        <div v-if="crud.props.searchToggle" class="search">
-          <!-- 搜索 -->
-          <el-input
-            v-model="query.channelName"
-            clearable
-            size="small"
-            placeholder="请输入代理商"
-            style="width: 200px"
-            class="filter-item"
-            @keyup.enter.native="crud.toQuery"
-          />
-          <rrOperation />
-        </div>
-      </div>
-      <!-- 表格(一级列表) -->
-      <el-table
-        ref="tables"
-        v-loading="crud.loading"
-        :data="crud.data"
-        style="width: 100%; margin-bottom: 20px"
-        :header-cell-style="{ 'text-align': 'left' }"
-        @selection-change="firstLevelhandleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column type="expand">
-          <template slot-scope="props">
-            <!-- 二级列表 -->
-            <el-table
-              ref="childrenTable"
-              :data="props.row.children"
-              :header-cell-style="{ 'text-align': 'left' }"
-              @selection-change="handleSelectionChange"
-            >
-              <el-table-column width="55" />
-              <el-table-column type="selection" width="55" />
-              <el-table-column
-                :show-overflow-tooltip="true"
-                prop="channelName"
-                label="客户名称"
-              />
-              <el-table-column
-                :show-overflow-tooltip="true"
-                prop="surplusNum"
-                label="分配余量"
-              />
-              <el-table-column
-                :show-overflow-tooltip="true"
-                prop="status"
-                label="客户状态"
-              >
-                <template slot-scope="scope">
-                  <span
-                    :style="{
-                      color:
-                        scope.row.status == 1
-                          ? '#82b538'
-                          : scope.row.status == 2
-                            ? '#e79e41'
-                            : '#c82a2a',
-                    }"
-                  >
-                    {{
-                      scope.row.status == 1
-                        ? "正常"
-                        : scope.row.status == 2
-                          ? "待开通"
-                          : "禁用"
-                    }}
-                  </span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                :show-overflow-tooltip="true"
-                prop="activationCode"
-                label="渠道码"
-              >
-                <template slot-scope="scope">
-                  {{
-                    scope.row.activationCode !== null
-                      ? scope.row.activationCode
-                      : "——"
-                  }}
-                </template>
-              </el-table-column>
-              <el-table-column
-                :show-overflow-tooltip="true"
-                prop="nid"
-                label="创建时间"
-              >
-                <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" width="160">
-                <template slot-scope="scope">
-                  <div style="display: flex; align-items: center">
-                    <el-button
-                      slot="reference"
-                      class="popover-item"
-                      type="text"
-                      :disabled="scope.row.status === 1"
-                      @click="bind(scope.row)"
-                    >
-                      绑定
-                    </el-button>
-                    <span style="color: #d7d7d7; margin: 0 5px">|</span>
-                    <el-button
-                      slot="reference"
-                      class="popover-item"
-                      type="text"
-                      :disabled="scope.row.status === 3"
-                      @click="forbidden(scope.row)"
-                    >
-                      禁用</el-button>
-                  </div>
-                </template>
-              </el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="channelName"
-          label="名称"
-        />
-
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="totalNum"
-          label="总分配量"
-          sortable
-          width="100"
-        />
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="surplusNum"
-          label="分配余量"
-          sortable
-          width="100"
-        />
-        <el-table-column label="客户数" prop="children" sortable>
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.children && scope.row.children.length > 0
-                ? scope.row.children.length
-                : "-"
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="normalNum"
-          label="开通使用客户数"
-        >
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.normalNum==null||scope.row.normalNum==''
-                ? "-"
-                : scope.row.normalNum
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="waitNum"
-          label="待处理开通客户数"
-        >
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.waitNum==null||scope.row.waitNum==''
-                ? "-"
-                : scope.row.waitNum
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="createTime"
-          label="创建时间"
-        >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="160">
-          <template slot-scope="scope">
-            <div style="display: flex; align-items: center">
-              <el-button
-                slot="reference"
-                class="popover-item"
-                type="text"
-                @click="openAccountNumberLimit(scope.row)"
-              >
-                限量
-              </el-button>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--开通账号数量限制弹出框-->
-      <el-dialog
-        append-to-body
-        :close-on-click-modal="false"
-        :visible.sync="openAccountNumberLimitDialogVisible"
-        title="开通账号数量限制"
-        width="570px"
-        @close="openAccountNumberLimitDialogClose"
-      >
-        <el-form
-          ref="openAccountNumberLimitFormRef"
-          :inline="true"
-          :model="channelCustom"
-          :rules="openAccountNumberLimitRules"
-          size="small"
-          label-width="140px"
-          class="openAccountNumberLimit"
-        >
-          <el-form-item
-            label="开通直客账号数: "
-            class="isChoose"
-            prop="customLimitNum"
-          >
-            <el-input
-              v-model="channelCustom.customLimitNum"
-              type="text"
-              @input="allNumber(channelCustom.customLimitNum,'channelCustom.customLimitNum')"
-            />
-            <span style="margin-left: 10px">个</span>
-          </el-form-item>
-          <el-form-item
-            label="开通代理商账号数: "
-            class="isChoose"
-            prop="channelLimitNum"
-          >
-            <el-input
-              v-model="channelCustom.channelLimitNum"
-              type="text"
-              @input="allNumber(channelCustom.channelLimitNum,'channelCustom.channelLimitNum')"
-            />
-            <span style="margin-left: 10px">个</span>
-          </el-form-item>
-
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button
-            type="text"
-            @click="openAccountNumberLimitDialogClose"
-          >取消</el-button>
-          <el-button
-            :loading="openAccountNumberLimitSubmitLoading"
-            type="primary"
-            @click="openAccountNumberLimitsubmit"
-          >提交</el-button>
-        </div>
-      </el-dialog>
-      <!--分页组件-->
-      <pagination />
-    </el-row>
-  </div>
-</template>
-
-<script>
-import crudUser from '@/api/system/user'
-// import { isvalidPhone } from '@/utils/validate'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import pagination from '@crud/Pagination'
-import { mapGetters } from 'vuex'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import {
-  activateAndActivate,
-  disableDeletion,
-  statistics,
-  openAccountNumberLimit
-} from '@/api/agentManagement/index'
-
-const defaultForm = {
-  id: null,
-  username: null,
-  nickName: null,
-  gender: '渠道商账号',
-  email: null,
-  enabled: 'false',
-  turnCrmNum: 50,
-  roles: [],
-  jobs: [],
-  dept: { id: null },
-  phone: null
-}
-export default {
-  name: 'AgentManagement',
-  components: {
-    crudOperation,
-    rrOperation,
-    pagination
-  },
-  cruds() {
-    return CRUD({
-      title: '渠道商管理',
-      url: '/api-management/api/channel/queryAll',
-      crudMethod: { ...crudUser },
-      optShow: {}
-      // params: { page: 0, sort: 0 }
-      // props: { dowmapi: "api-management/api/users" }
-    })
-  },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  data() {
-    // 自定义验证
-    // const validPhone = (rule, value, callback) => {
-    //   if (!value) {
-    //     callback(new Error('请输入电话号码'))
-    //   } else if (!isvalidPhone(value)) {
-    //     callback(new Error('请输入正确的11位手机号码'))
-    //   } else {
-    //     callback()
-    //   }
-    // }
-    return {
-      height: document.documentElement.clientHeight - 180 + 'px;',
-      defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
-      permission: {
-        add: ['admin', 'user:add'],
-        edit: ['admin', 'user:edit'],
-        del: ['admin', 'user:del'],
-        download: ['admin', 'user:download'],
-        more: true,
-        // recharge: true,
-        delUser: true
-      },
-      // 选中的客户id
-      ids: [],
-      // 控制批量删除按钮是否禁用
-      // selection: [],
-      // 控制批量开通、批量删除按钮是否禁用
-      selections: [],
-      // 控制绑定的时候表格默认展开,用来存放一级列表即需展开列表当前需展开项的id
-      expand: [],
-      // 统计数据
-      statisticsData: {},
-      // 父id
-      parentId: '',
-      // 开通账号数量限制弹出框控制显隐
-      openAccountNumberLimitDialogVisible: false,
-      // 当前渠道商id
-      // agentId: '',
-      // 开通账号数量限制表单数据
-      channelCustom: {
-        id: '',
-        customLimitNum: '',
-        channelLimitNum: ''
-        // openAccountNumberLimit: ''
-      },
-      openAccountNumberLimitRules: {
-        customLimitNum: [
-          { required: true, message: '请输入开通直客账号数', trigger: 'blur' }
-        ],
-        channelLimitNum: [
-          { required: true, message: '请输入开通代理商账号数', trigger: 'blur' }
-        ]
-      },
-      //  开通账号数量限制弹出框提交Loading
-      openAccountNumberLimitSubmitLoading: false
-    }
-  },
-
-  computed: {
-    ...mapGetters(['user'])
-  },
-  created() {
-    this.crud.msg.add = '新增成功，默认密码：123456'
-    this.getStatisticsData()
-  },
-  mounted: function() {
-    const that = this
-    window.onresize = function temp() {
-      that.height = document.documentElement.clientHeight - 180 + 'px;'
-    }
-  },
-  methods: {
-    // 打开开通账号数量限制弹出框
-    openAccountNumberLimit(data) {
-      // this.agentId = data.id
-      this.channelCustom.id = data.id
-      this.channelCustom.channelLimitNum = data.channelLimitNum
-      this.channelCustom.customLimitNum = data.customLimitNum
-      this.openAccountNumberLimitDialogVisible = true
-    },
-    // 开通账号数量限制input事件
-    allNumber(value, data) {
-      value = value.replace(/[^\d]/g, '') // 只能输入数字
-      if (data === 'channelCustom.customLimitNum') {
-        this.channelCustom.customLimitNum = value// 注意这里是string，你要数字类型记得自己转一下
-      } else if (data === 'this.channelCustom.channelLimitNum') {
-        this.channelCustom.channelLimitNum = value // 注意这里是string，你要数字类型记得自己转一下
-      }
-    },
-    // 开通账号数量限制提交事件
-    openAccountNumberLimitsubmit() {
-      this.$refs['openAccountNumberLimitFormRef'].validate(valid => {
-        if (valid) {
-          this.openAccountNumberLimitDialogVisible = true
-          openAccountNumberLimit(this.channelCustom)
-            .then(res => {
-              if (res.status === 0) {
-                this.openAccountNumberLimitDialogVisible = false
-                this.$message.success('操作成功')
-                this.openAccountNumberLimitDialogClose()
-                this.crud.toQuery()
-              } else {
-                this.$message.error(res.msg)
-              }
-            })
-            .catch(() => {
-              this.openAccountNumberLimitDialogVisible = false
-            })
-        } else {
-          return false
-        }
-      })
-    },
-    // 开通账号数量限制弹出框关闭
-    openAccountNumberLimitDialogClose() {
-      this.openAccountNumberLimitDialogVisible = false
-      // this.channelCustom.channelLimitNum = ''
-      // this.channelCustom.customLimitNum = ''
-      this.channelCustom.id = ''
-      // this.agentId = ''
-      this.$refs['openAccountNumberLimitFormRef'].clearValidate()
-    },
-    // 获取统计数据
-    async getStatisticsData() {
-      const res = await statistics()
-      if (res.status === 0) {
-        this.statisticsData = res.data
-      } else {
-        this.$message.error(res.msg)
-      }
-    },
-    // 批量开通
-    async batchActivation() {
-      const res = await activateAndActivate(this.ids)
-      if (res.status === 0) {
-        this.$message.success('操作成功')
-        this.crud.toQuery()
-      } else {
-        this.$message.error(res.message)
-      }
-    },
-    // 批量删除
-    async batchDeletion() {
-      const res = await disableDeletion(this.ids)
-      if (res.status === 0) {
-        this.$message.success('删除成功')
-        this.crud.toQuery()
-        this.getStatisticsData()
-      } else {
-        this.$message.error(res.msg)
-      }
-    },
-    // 一级列表当选择项发生变化时会触发该事件
-    firstLevelhandleSelectionChange(val) {
-      // this.selection = [];
-      // // this.selections=[]
-      // val.forEach(item => {
-      //   this.selection.push(item.id);
-      //   // this.selections.push(item.id);
-      // });
-      // console.log(this.selection, "this.selection");
-    },
-    // 二级列表当选择项发生变化时会触发该事件
-    handleSelectionChange(val) {
-      this.ids = []
-      // this.selection = [];
-      this.selections = []
-      val.forEach((item) => {
-        this.ids.push(item.id)
-        // this.selection.push(item.id);
-        this.selections.push(item.id)
-      })
-    },
-    // 点击子节点输出该子节点的父节点数据
-    // children  是数据的子节点的集合名称，可以根据实际字段自己修改，item2即点击的这一条数据。item就是我们要拿到的父级的数据了
-    rowClick(val) {
-      this.crud.data.forEach((item) => {
-        // 判断该行是否有子节点
-        if ('children' in item) {
-          // 遍历子节点
-          item.children &&
-            item.children.forEach((item2) => {
-              // 判断该节点是否为我点击的节点
-              if (item2.id === val) {
-                // 父ID
-                this.parentId = item.id
-              }
-            })
-        }
-      })
-    },
-    // 绑定
-    async bind(data) {
-      // console.log(data.id, "data.id");
-      // this.rowClick(data.id);
-      // this.expand.push(this.parentId);
-      // console.log(this.expand, "this.expand");
-      // console.log(data, "data222");
-      const res = await activateAndActivate([data.id])
-      if (res.status === 0) {
-        this.$message.success('操作成功')
-        // console.log("123");
-        data.status = 1
-        // await this.crud.toQuery();
-        // console.log("456");
-        // this.rowClick(data.id);
-        // this.expand.push(this.parentId);
-        // console.log(this.expand, "this.expand");
-      } else {
-        this.$message.error(res.msg)
-      }
-    },
-    // 禁用
-    async forbidden(data) {
-      const res = await disableDeletion([data.id])
-      if (res.status === 0) {
-        this.$message.success('操作成功')
-        data.status = 3
-        // this.crud.toQuery();
-      } else {
-        this.$message.error(res.msg)
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.head-container {
-  display: flex;
-  align-items: center;
-}
-//监测数量区域
-.detectQuantityArea {
-  font-size: 14px;
-  margin-bottom: 50px;
-}
-//数量名称
-.quantityName {
-  color: #909399;
-}
-//重点数量
-.keyQuantity {
-  font-size: 25px;
-  margin-top: 15px;
-}
-.popover-item {
-  display: block;
-  cursor: pointer;
-  height: 30px;
-  font-size: 13px;
-  text-align: center;
-  span {
-    padding: 0 15px;
-  }
-}
-.popover-item:hover {
-  background: #e8f4ff;
-}
-.search {
-  margin-left: 5px;
-}
-//开通账号数量限制
-.openAccountNumberLimit {
-  ::v-deep .el-form-item {
-    display: flex;
-    justify-content: center;
-  }
-  ::v-deep .el-form-item__content {
-    display: flex;
-  }
-}
-</style>
+<template>
+  <div class="app-container">
+    <!-- 检测指标 -->
+    <el-row class="detectQuantityArea">
+      <el-col
+        :span="6"
+        :offset="9"
+        style="border: 1px solid #dcdfe6; padding: 20px"
+      >
+        <div>
+          <div style="display: flex">
+            <span
+              class="quantityName"
+              style="margin-right: 130px"
+            >总代理商</span>
+            <i class="el-icon-warning-outline quantityName" />
+          </div>
+          <div class="keyQuantity">{{ statisticsData.totalNum }}</div>
+          <p>
+            <span
+              class="quantityName"
+              style="margin-right: 12px"
+            >本周新增</span>
+            <i class="el-icon-caret-top" style="color: #a4d783" />
+            <span style="margin-right: 12px">{{ statisticsData.weekNum }}</span>
+            <span
+              class="quantityName"
+              style="margin-right: 12px"
+            >昨日新增</span>
+            <i class="el-icon-caret-bottom" style="color: #e13c39" />
+            <!-- <span
+              class="quantityName"
+              style="margin-right: 12px"
+            >本周新增</span>
+            <i class="el-icon-caret-top" style="color: #a4d783" />
+            <span style="margin-right: 12px">{{ statisticsData.weekNum }}</span>
+            <span
+              class="quantityName"
+              style="margin-right: 12px"
+            >昨日新增</span>
+            <i class="el-icon-caret-bottom" style="color: #e13c39" /> -->
+            <span style="margin-right: 12px">{{ statisticsData.dayNum }}</span>
+          </p>
+        </div>
+      </el-col>
+    </el-row>
+    <!-- 工具栏、表格 -->
+    <el-row :gutter="20">
+      <!-- 工具栏 -->
+      <div class="head-container">
+        <!-- 左侧添加账号、批量禁用 -->
+        <crudOperation show="" :permission="permission" :is-show="true">
+          <template v-slot:right>
+            <el-button
+              class="filter-item"
+              size="mini"
+              type="primary"
+              :disabled="selections.length === 0"
+              @click="batchActivation"
+            >批量开通</el-button>
+            <el-button
+              class="filter-item"
+              size="mini"
+              :disabled="selections.length === 0"
+              @click="batchDeletion"
+            >
+              批量禁用
+            </el-button>
+          </template>
+        </crudOperation>
+        <!-- 右侧搜索、筛选 -->
+        <div v-if="crud.props.searchToggle" class="search">
+          <!-- 搜索 -->
+          <el-input
+            v-model="query.channelName"
+            clearable
+            size="small"
+            placeholder="请输入代理商"
+            style="width: 200px"
+            class="filter-item"
+            @keyup.enter.native="crud.toQuery"
+          />
+          <rrOperation />
+        </div>
+      </div>
+      <!-- 表格(一级列表) -->
+      <el-table
+        ref="tables"
+        v-loading="crud.loading"
+        :data="crud.data"
+        style="width: 100%; margin-bottom: 20px"
+        :header-cell-style="{ 'text-align': 'left' }"
+        @selection-change="firstLevelhandleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column type="expand">
+          <template slot-scope="props">
+            <!-- 二级列表 -->
+            <el-table
+              ref="childrenTable"
+              :data="props.row.children"
+              :header-cell-style="{ 'text-align': 'left' }"
+              @selection-change="handleSelectionChange"
+            >
+              <el-table-column width="55" />
+              <el-table-column type="selection" width="55" />
+              <el-table-column
+                :show-overflow-tooltip="true"
+                prop="channelName"
+                label="客户名称"
+              />
+              <el-table-column
+                :show-overflow-tooltip="true"
+                prop="surplusNum"
+                label="分配余量"
+              />
+              <el-table-column
+                :show-overflow-tooltip="true"
+                prop="status"
+                label="客户状态"
+              >
+                <template slot-scope="scope">
+                  <span
+                    :style="{
+                      color:
+                        scope.row.status == 1
+                          ? '#82b538'
+                          : scope.row.status == 2
+                            ? '#e79e41'
+                            : '#c82a2a',
+                    }"
+                  >
+                    {{
+                      scope.row.status == 1
+                        ? "正常"
+                        : scope.row.status == 2
+                          ? "待开通"
+                          : "禁用"
+                    }}
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                :show-overflow-tooltip="true"
+                prop="activationCode"
+                label="渠道码"
+              >
+                <template slot-scope="scope">
+                  {{
+                    scope.row.activationCode !== null
+                      ? scope.row.activationCode
+                      : "——"
+                  }}
+                </template>
+              </el-table-column>
+              <el-table-column
+                :show-overflow-tooltip="true"
+                prop="nid"
+                label="创建时间"
+              >
+                <template slot-scope="scope">
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="100">
+                <template slot-scope="scope">
+                  <div style="display: flex; align-items: center">
+                    <el-button
+                      slot="reference"
+                      class="popover-item"
+                      type="text"
+                      :disabled="scope.row.status === 1"
+                      @click="bind(scope.row)"
+                    >
+                      绑定
+                    </el-button>
+                    <!-- <span style="color: #d7d7d7; margin: 0 5px">|</span> -->
+                    <el-button
+                      slot="reference"
+                      class="popover-item"
+                      type="text"
+                      :disabled="scope.row.status === 3"
+                      @click="forbidden(scope.row)"
+                    >
+                      禁用</el-button>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="channelName"
+          label="名称"
+        />
+
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="totalNum"
+          label="总分配量"
+          sortable
+          width="100"
+        />
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="surplusNum"
+          label="分配余量"
+          sortable
+          width="100"
+        />
+        <el-table-column label="客户数" prop="children" sortable>
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.children && scope.row.children.length > 0
+                ? scope.row.children.length
+                : "-"
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="normalNum"
+          label="开通使用客户数"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.normalNum==null||scope.row.normalNum==''
+                ? "-"
+                : scope.row.normalNum
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="waitNum"
+          label="待处理开通客户数"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.waitNum==null||scope.row.waitNum==''
+                ? "-"
+                : scope.row.waitNum
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="createTime"
+          label="创建时间"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="75">
+          <template slot-scope="scope">
+            <div style="display: flex; align-items: center">
+              <el-button
+                slot="reference"
+                class="popover-item"
+                type="text"
+                @click="openAccountNumberLimit(scope.row)"
+              >
+                限量
+              </el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--开通账号数量限制弹出框-->
+      <el-dialog
+        append-to-body
+        :close-on-click-modal="false"
+        :visible.sync="openAccountNumberLimitDialogVisible"
+        title="开通账号数量限制"
+        width="570px"
+        @close="openAccountNumberLimitDialogClose"
+      >
+        <el-form
+          ref="openAccountNumberLimitFormRef"
+          :inline="true"
+          :model="channelCustom"
+          :rules="openAccountNumberLimitRules"
+          size="small"
+          label-width="140px"
+          class="openAccountNumberLimit"
+        >
+          <el-form-item
+            label="开通直客账号数: "
+            class="isChoose"
+            prop="customLimitNum"
+          >
+            <el-input
+              v-model="channelCustom.customLimitNum"
+              type="text"
+              @input="allNumber(channelCustom.customLimitNum,'channelCustom.customLimitNum')"
+            />
+            <span style="margin-left: 10px">个</span>
+          </el-form-item>
+          <el-form-item
+            label="开通代理商账号数: "
+            class="isChoose"
+            prop="channelLimitNum"
+          >
+            <el-input
+              v-model="channelCustom.channelLimitNum"
+              type="text"
+              @input="allNumber(channelCustom.channelLimitNum,'channelCustom.channelLimitNum')"
+            />
+            <span style="margin-left: 10px">个</span>
+          </el-form-item>
+
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button
+            type="text"
+            @click="openAccountNumberLimitDialogClose"
+          >取消</el-button>
+          <el-button
+            :loading="openAccountNumberLimitSubmitLoading"
+            type="primary"
+            @click="openAccountNumberLimitsubmit"
+          >提交</el-button>
+        </div>
+      </el-dialog>
+      <!--分页组件-->
+      <pagination />
+    </el-row>
+  </div>
+</template>
+
+<script>
+import crudUser from '@/api/system/user'
+// import { isvalidPhone } from '@/utils/validate'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import { mapGetters } from 'vuex'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import {
+  activateAndActivate,
+  disableDeletion,
+  statistics,
+  openAccountNumberLimit
+} from '@/api/agentManagement/index'
+
+const defaultForm = {
+  id: null,
+  username: null,
+  nickName: null,
+  gender: '渠道商账号',
+  email: null,
+  enabled: 'false',
+  turnCrmNum: 50,
+  roles: [],
+  jobs: [],
+  dept: { id: null },
+  phone: null
+}
+export default {
+  name: 'AgentManagement',
+  components: {
+    crudOperation,
+    rrOperation,
+    pagination
+  },
+  cruds() {
+    return CRUD({
+      title: '渠道商管理',
+      url: '/api-management/api/channel/queryAll',
+      crudMethod: { ...crudUser },
+      optShow: {}
+      // params: { page: 0, sort: 0 }
+      // props: { dowmapi: "api-management/api/users" }
+    })
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  data() {
+    // 自定义验证
+    // const validPhone = (rule, value, callback) => {
+    //   if (!value) {
+    //     callback(new Error('请输入电话号码'))
+    //   } else if (!isvalidPhone(value)) {
+    //     callback(new Error('请输入正确的11位手机号码'))
+    //   } else {
+    //     callback()
+    //   }
+    // }
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
+      permission: {
+        add: ['admin', 'user:add'],
+        edit: ['admin', 'user:edit'],
+        del: ['admin', 'user:del'],
+        download: ['admin', 'user:download'],
+        more: true,
+        // recharge: true,
+        delUser: true
+      },
+      // 选中的客户id
+      ids: [],
+      // 控制批量删除按钮是否禁用
+      // selection: [],
+      // 控制批量开通、批量删除按钮是否禁用
+      selections: [],
+      // 控制绑定的时候表格默认展开,用来存放一级列表即需展开列表当前需展开项的id
+      expand: [],
+      // 统计数据
+      statisticsData: {},
+      // 父id
+      parentId: '',
+      // 开通账号数量限制弹出框控制显隐
+      openAccountNumberLimitDialogVisible: false,
+      // 当前渠道商id
+      // agentId: '',
+      // 开通账号数量限制表单数据
+      channelCustom: {
+        id: '',
+        customLimitNum: '',
+        channelLimitNum: ''
+        // openAccountNumberLimit: ''
+      },
+      openAccountNumberLimitRules: {
+        customLimitNum: [
+          { required: true, message: '请输入开通直客账号数', trigger: 'blur' }
+        ],
+        channelLimitNum: [
+          { required: true, message: '请输入开通代理商账号数', trigger: 'blur' }
+        ]
+      },
+      //  开通账号数量限制弹出框提交Loading
+      openAccountNumberLimitSubmitLoading: false
+    }
+  },
+
+  computed: {
+    ...mapGetters(['user'])
+  },
+  created() {
+    this.crud.msg.add = '新增成功，默认密码：123456'
+    this.getStatisticsData()
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  methods: {
+    // 打开开通账号数量限制弹出框
+    openAccountNumberLimit(data) {
+      // this.agentId = data.id
+      this.channelCustom.id = data.id
+      this.channelCustom.channelLimitNum = data.channelLimitNum
+      this.channelCustom.customLimitNum = data.customLimitNum
+      this.openAccountNumberLimitDialogVisible = true
+    },
+    // 开通账号数量限制input事件
+    allNumber(value, data) {
+      value = value.replace(/[^\d]/g, '') // 只能输入数字
+      if (data === 'channelCustom.customLimitNum') {
+        this.channelCustom.customLimitNum = value// 注意这里是string，你要数字类型记得自己转一下
+      } else if (data === 'this.channelCustom.channelLimitNum') {
+        this.channelCustom.channelLimitNum = value // 注意这里是string，你要数字类型记得自己转一下
+      }
+    },
+    // 开通账号数量限制提交事件
+    openAccountNumberLimitsubmit() {
+      this.$refs['openAccountNumberLimitFormRef'].validate(valid => {
+        if (valid) {
+          this.openAccountNumberLimitDialogVisible = true
+          openAccountNumberLimit(this.channelCustom)
+            .then(res => {
+              if (res.status === 0) {
+                this.openAccountNumberLimitDialogVisible = false
+                this.$message.success('操作成功')
+                this.openAccountNumberLimitDialogClose()
+                this.crud.toQuery()
+              } else {
+                this.$message.error(res.msg)
+              }
+            })
+            .catch(() => {
+              this.openAccountNumberLimitDialogVisible = false
+            })
+        } else {
+          return false
+        }
+      })
+    },
+    // 开通账号数量限制弹出框关闭
+    openAccountNumberLimitDialogClose() {
+      this.openAccountNumberLimitDialogVisible = false
+      // this.channelCustom.channelLimitNum = ''
+      // this.channelCustom.customLimitNum = ''
+      this.channelCustom.id = ''
+      // this.agentId = ''
+      this.$refs['openAccountNumberLimitFormRef'].clearValidate()
+    },
+    // 获取统计数据
+    async getStatisticsData() {
+      const res = await statistics()
+      if (res.status === 0) {
+        this.statisticsData = res.data
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 批量开通
+    async batchActivation() {
+      const res = await activateAndActivate(this.ids)
+      if (res.status === 0) {
+        this.$message.success('操作成功')
+        this.crud.toQuery()
+      } else {
+        this.$message.error(res.message)
+      }
+    },
+    // 批量删除
+    async batchDeletion() {
+      const res = await disableDeletion(this.ids)
+      if (res.status === 0) {
+        this.$message.success('删除成功')
+        this.crud.toQuery()
+        this.getStatisticsData()
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 一级列表当选择项发生变化时会触发该事件
+    firstLevelhandleSelectionChange(val) {
+      // this.selection = [];
+      // // this.selections=[]
+      // val.forEach(item => {
+      //   this.selection.push(item.id);
+      //   // this.selections.push(item.id);
+      // });
+      // console.log(this.selection, "this.selection");
+    },
+    // 二级列表当选择项发生变化时会触发该事件
+    handleSelectionChange(val) {
+      this.ids = []
+      // this.selection = [];
+      this.selections = []
+      val.forEach((item) => {
+        this.ids.push(item.id)
+        // this.selection.push(item.id);
+        this.selections.push(item.id)
+      })
+    },
+    // 点击子节点输出该子节点的父节点数据
+    // children  是数据的子节点的集合名称，可以根据实际字段自己修改，item2即点击的这一条数据。item就是我们要拿到的父级的数据了
+    rowClick(val) {
+      this.crud.data.forEach((item) => {
+        // 判断该行是否有子节点
+        if ('children' in item) {
+          // 遍历子节点
+          item.children &&
+            item.children.forEach((item2) => {
+              // 判断该节点是否为我点击的节点
+              if (item2.id === val) {
+                // 父ID
+                this.parentId = item.id
+              }
+            })
+        }
+      })
+    },
+    // 绑定
+    async bind(data) {
+      // console.log(data.id, "data.id");
+      // this.rowClick(data.id);
+      // this.expand.push(this.parentId);
+      // console.log(this.expand, "this.expand");
+      // console.log(data, "data222");
+      const res = await activateAndActivate([data.id])
+      if (res.status === 0) {
+        this.$message.success('操作成功')
+        // console.log("123");
+        data.status = 1
+        // await this.crud.toQuery();
+        // console.log("456");
+        // this.rowClick(data.id);
+        // this.expand.push(this.parentId);
+        // console.log(this.expand, "this.expand");
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 禁用
+    async forbidden(data) {
+      const res = await disableDeletion([data.id])
+      if (res.status === 0) {
+        this.$message.success('操作成功')
+        data.status = 3
+        // this.crud.toQuery();
+      } else {
+        this.$message.error(res.msg)
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.head-container {
+  display: flex;
+  align-items: center;
+}
+//监测数量区域
+.detectQuantityArea {
+  font-size: 14px;
+  margin-bottom: 50px;
+}
+//数量名称
+.quantityName {
+  color: #909399;
+}
+//重点数量
+.keyQuantity {
+  font-size: 25px;
+  margin-top: 15px;
+}
+.popover-item {
+  display: block;
+  cursor: pointer;
+  height: 30px;
+  font-size: 13px;
+  text-align: center;
+  span {
+    padding: 0 15px;
+  }
+}
+.popover-item:hover {
+  background: #e8f4ff;
+}
+.search {
+  margin-left: 5px;
+}
+//开通账号数量限制
+.openAccountNumberLimit {
+  ::v-deep .el-form-item {
+    display: flex;
+    justify-content: center;
+  }
+  ::v-deep .el-form-item__content {
+    display: flex;
+  }
+}
+</style>
diff --git a/src/views/customerManagement/index.vue b/src/views/customerManagement/index.vue
index 6a00e0e..b5d02ac 100644
--- a/src/views/customerManagement/index.vue
+++ b/src/views/customerManagement/index.vue
@@ -570,17 +570,17 @@
           label="dmp投量"
         />
 
-        <el-table-column label="操作" width="240" fixed="right">
+        <el-table-column label="操作" width="140" fixed="right">
           <template slot-scope="scope">
             <div style="display: flex; align-items: center">
-              <span style="color: #246fdc; margin-right: 5px">|</span>
+              <!-- <span style="color: #246fdc; margin-right: 5px">|</span> -->
               <el-button
                 slot="reference"
                 class="popover-item"
                 type="text"
                 @click="allotmentQuantity(scope.row)"
               >配量</el-button>
-              <span style="color: #246fdc; margin: 0 5px">|</span>
+              <!-- <span style="color: #246fdc; margin: 0 5px">|</span> -->
               <el-button
                 slot="reference"
                 class="popover-item"
@@ -589,7 +589,7 @@
                 @click="generateLink(scope.row)"
               >
                 生链</el-button>
-              <span style="color: #246fdc; margin-left: 5px">|</span>
+              <!-- <span style="color: #246fdc; margin-left: 5px">|</span> -->
               <el-button
                 slot="reference"
                 class="popover-item"
@@ -598,7 +598,7 @@
                 @click="modifyDeliveryQuantity(scope.row)"
               >
                 改量</el-button>
-              <span style="color: #246fdc; margin-left: 5px">|</span>
+              <!-- <span style="color: #246fdc; margin-left: 5px">|</span> -->
             </div>
           </template>
         </el-table-column>
diff --git a/src/views/internationalWaters/adminIndexList.vue b/src/views/internationalWaters/adminIndexList.vue
index ce7d385..4e4aa31 100644
--- a/src/views/internationalWaters/adminIndexList.vue
+++ b/src/views/internationalWaters/adminIndexList.vue
@@ -1,1128 +1,1128 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--用户数据-->
-      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-        <!--工具栏-->
-        <div class="head-container">
-          <div class="u-flex u-flex-wrap">
-            <!-- 搜索 -->
-            <div class="u-flex">
-              <label class="y-label">客户名称：</label>
-              <el-input
-                v-model="query.name"
-                clearable
-                size="small"
-                placeholder="请输入"
-                style="width: 170px;"
-                class="filter-item"
-                @keyup.enter.native="crud.toQuery"
-              />
-            </div>
-            <div class="u-flex">
-              <label class="y-label">标签名称：</label>
-              <el-input
-                v-model="query.label"
-                clearable
-                size="small"
-                placeholder="请输入"
-                style="width: 170px;"
-                class="filter-item"
-                @keyup.enter.native="crud.toQuery"
-              />
-            </div>
-            <div class="u-flex">
-              <label class="y-label">渠道标签：</label>
-              <el-select
-                v-model="query.routeId"
-                clearable
-                size="small"
-                placeholder="请选择"
-                class="filter-item"
-                style="width: 170px"
-                @change="crud.toQuery"
-              >
-                <el-option
-                  v-for="item in channelSource"
-                  :key="item.id"
-                  :label="item.routeName"
-                  :value="item.id"
-                />
-              </el-select>
-            </div>
-            <div class="u-flex">
-              <label class="y-label">呼叫状态：</label>
-              <el-select
-                v-model="query.clueCallStatus"
-                clearable
-                size="small"
-                placeholder="请选择"
-                class="filter-item"
-                style="width: 170px"
-                @change="crud.toQuery"
-              >
-                <el-option
-                  v-for="item in conversationState"
-                  :key="item.value"
-                  :label="item.key"
-                  :value="item.value"
-                />
-              </el-select>
-            </div>
-            <div class="u-flex">
-              <label class="y-label">线索状态：</label>
-              <el-select
-                v-model="query.status"
-                clearable
-                size="small"
-                placeholder="请选择"
-                class="filter-item"
-                style="width: 170px"
-                @change="crud.toQuery"
-              >
-                <el-option
-                  v-for="item in cluesDrawState"
-                  :key="item.value"
-                  :label="item.key"
-                  :value="item.value"
-                />
-              </el-select>
-            </div>
-            <div class="u-flex">
-              <label class="y-label">线索阶段：</label>
-              <el-select
-                v-model="query.clueStage"
-                clearable
-                size="small"
-                placeholder="请选择"
-                class="filter-item"
-                style="width: 170px"
-                @change="crud.toQuery"
-              >
-                <el-option
-                  v-for="item in cluestage"
-                  :key="item.value"
-                  :label="item.key"
-                  :value="item.value"
-                />
-              </el-select>
-            </div>
-            <div class="u-flex">
-              <label class="y-label">呼叫日期：</label>
-              <date-range-picker v-model="query.newestCallTime" start-placeholder="上次呼叫开始" end-placeholder="上次呼叫结束" class="date-item" />
-            </div>
-            <rrOperation style="margin-left: 5px;" />
-          </div>
-        </div>
-        <!--表格渲染-->
-        <el-table ref="table" v-loading="crud.loading" style="width: 100%;" :data="crud.data" :header-cell-style="{'text-align':'left'}" :row-class-name="tableRowClassName">
-          <el-table-column :show-overflow-tooltip="true" prop="clueId" label="ID" width="80" />
-          <el-table-column :show-overflow-tooltip="true" prop="clueName" label="姓名" />
-          <el-table-column :show-overflow-tooltip="true" prop="clueCallStatus" label="上次通话状态" width="100">
-            <template slot-scope="scope">
-              <div>{{ statecCmparison('conversationState', scope.row.clueCallStatus) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column width="180" label="标签">
-            <template slot-scope="scope">
-              <el-popover trigger="hover" placement="top">
-                <el-tag v-for="(item, index) in scope.row.sourceLabel" :key="index" type="info" class="mr-5" :class="'color'+ index">{{ item }}</el-tag>
-                <div slot="reference" class="name-wrapper u-flex">
-                  <el-tag v-for="(item, index) in scope.row.sourceLabel" :key="index" type="info" class="mr-5" :class="'color'+ index">{{ item }}</el-tag>
-                </div>
-              </el-popover>
-            </template>
-          </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" prop="status" label="线索状态">
-            <template slot-scope="scope">
-              <el-tag :type="scope.row.status == 1 ? 'success' : ''">{{ scope.row.status == 1 ? '可领取' : '公示中' }}</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" prop="clueStage" label="线索阶段">
-            <template slot-scope="scope">
-              <div>{{ statecCmparison('cluestage', scope.row.clueStage) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" width="130" prop="clueRecord" label="最新跟进记录">
-            <template slot-scope="scope">
-              <div class="remark-lbael">{{ scope.row.clueRecord }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" prop="newestCallTime" label="上次呼叫时间" width="130">
-            <template slot-scope="scope">
-              <div>{{ parseTime(scope.row.newestCallTime) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            width="140"
-            fixed="right"
-          >
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                @click="rowClick(scope.row)"
-              >详情</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                :disabled="scope.row.status != 1"
-                @click.stop="UpdateFun({type: 'receive', index: scope.$index})"
-              >领取</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!--分页组件-->
-        <pagination />
-      </el-col>
-      <!-- <el-col :xs="24" :sm="24" :md="5" :lg="5" :xl="5">
-        <Message />
-      </el-col> -->
-    </el-row>
-    <!-- 单个详情 -->
-    <el-drawer
-      title="客户管理"
-      :visible.sync="drawer"
-      :direction="direction"
-      :with-header="false"
-      :modal="false"
-      size="700px"
-      @close="drawerClose"
-    >
-      <div v-if="taskDetail" class="drawer-con">
-        <div v-if="taskDetail.clueName" class="group-top">
-          <div class="u-flex u-flex-between top-block">
-            <div class="u-flex">
-              <div class="text-hide-2 username">{{ taskDetail.clueName }}</div>
-            </div>
-          </div>
-        </div>
-        <!-- <div>
-          <div class="information">
-            <div class="u-flex information-item">
-              <label class="information-label">线索跟进人</label>
-              <el-tooltip :disabled="nameTooltip" class="item" effect="dark" :content="taskDetail.distributeUserName" placement="top-start">
-                <div class="it-line text-hide" @mouseover="onMouseover('nameTooltip')">
-                  <span ref="nameTooltip">{{ taskDetail.distributeUserName || '-' }}</span>
-                </div>
-              </el-tooltip>
-            </div>
-            <div class="u-flex information-item">
-              <label class="information-label">线索创建时间</label>
-              <div class="it-line text-hide">{{ parseTime(taskDetail.createTime) }}</div>
-            </div>
-            <div class="u-flex information-item">
-              <label class="information-label">电话</label>
-              <div class="it-line text-hide">{{ taskDetail.nid }}</div>
-            </div>
-            <div class="u-flex information-item">
-              <label class="information-label">微信</label>
-              <div class="it-line text-hide">{{ taskDetail.wx }} <span v-if="taskDetail.wx" class="a ml-5" @click="onCopy(taskDetail.wx)">复制</span></div>
-            </div>
-            <div class="u-flex information-item">
-              <label class="information-label">金额</label>
-              <div class="it-line text-hide">{{ taskDetail.amount }}</div>
-            </div>
-            <div class="u-flex information-item">
-              <label class="information-label">平台</label>
-              <div class="it-line text-hide">{{ taskDetail.platform || '未知' }}</div>
-            </div>
-            <div class="u-flex information-item">
-              <label class="information-label">线索渠道</label>
-              <div class="it-line text-hide">{{ statecCmparison('channelSource', taskDetail.origin) }} - 外部导入</div>
-            </div>
-            <div class="u-flex information-item">
-              <label class="information-label">线索归属地</label>
-              <el-tooltip :disabled="addressTooltip" class="item" effect="dark" :content="taskDetail.address" placement="top-start">
-                <div class="it-line text-hide" @mouseover="onMouseover('addressTooltip')">
-                  <span ref="addressTooltip">{{ taskDetail.address || '无信息' }}</span>
-                </div>
-              </el-tooltip>
-            </div>
-            <div class="u-flex information-item" style="align-items: center">
-              <label class="information-label">操作状态</label>
-              <div class="it-line text-hide label-img">
-                <img v-if="taskDetail.addWeChatStatus != 1" src="@/assets/images/qwcode-h.png" class="iconimg" alt="">
-                <el-tooltip v-else class="item" effect="dark" :content="parseTime(taskDetail.addWeChatTime)" placement="top">
-                  <img src="@/assets/images/qwcode.png" class="iconimg" alt="">
-                </el-tooltip>
-              </div>
-            </div>
-          </div>
-        </div> -->
-        <div :style="{'margin-top': (taskDetail.clueName ? '56px' : '0px')}">
-          <div v-if="taskDetail.sourceLabel.length > 0" class="labelCon">
-            <div class="detail-title u-flex u-flex-between"><p>线索打标</p></div>
-            <div class="labelInformation">
-              <div class="label-top">
-                <el-tag
-                  v-for="(tag, index) in taskDetail.sourceLabel"
-                  :key="index"
-                  class="mr-5 color33"
-                  :class="'color' + index"
-                  :disable-transitions="false"
-                >
-                  {{ tag }}
-                </el-tag>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div>
-          <div class="tabCon">
-            <div>
-              <el-tabs v-model="tabActive" @tab-click="tabClick">
-                <el-tab-pane label="通话记录" name="1">
-                  <div class="u-flex u-flex-between">
-                    <div class="title">通话总览</div>
-                    <span class="a down" @click.stop="downfile"><i class="el-icon-download" />下载通话记录</span>
-                  </div>
-                  <div class="u-flex overview">
-                    <div class="flex-1">
-                      <div class="t-title">电话拨打量</div>
-                      <div class="Statistics">{{ callRecordObj.usrNum }}</div>
-                    </div>
-                    <div class="flex-1">
-                      <div class="t-title">电话接通量</div>
-                      <div class="Statistics">{{ callRecordObj.turnOnNum }}</div>
-                    </div>
-                    <div class="flex-1">
-                      <div class="t-title">电话有效沟通量</div>
-                      <div class="Statistics">{{ callRecordObj.validNum }}</div>
-                    </div>
-                  </div>
-                  <div v-if="callRecordObj" class="recordCon">
-                    <div class="u-flex u-flex-between">
-                      <div class="title mt-15">通话记录</div>
-                    </div>
-                    <div v-if="callRecordObj.data.length > 0">
-                      <div v-for="(item, index) in callRecordObj.data" :key="index" class="mt-15">
-                        <div class="u-flex u-flex-between">
-                          <div class="toplink"><i class="el-icon-phone phoneicon mr-5" />{{ item.memberName }} <span class="ml-5 mr-5">打给</span>{{ item.clueName }}</div>
-                          <div class="state" :class="{ 'success' : item.status == 2 }">{{ item.status == 1 ? '未接通' : '已打通' }}</div>
-                        </div>
-                        <div class="audio_wrapper">
-                          <audio :src="item.recordFileDownloadUrl" controls class="audio" />
-                          <div class="audio_time">{{ parseTime(item.createTime) }}呼出</div>
-                        </div>
-                      </div>
-                    </div>
-                    <el-empty v-else description="暂无通话记录" :image="zanwu" />
-                  </div>
-                </el-tab-pane>
-                <el-tab-pane label="跟进记录" name="2">
-                  <div v-if="conductList.length > 0" class="tab-pan">
-                    <el-timeline :reverse="true">
-                      <el-timeline-item
-                        v-for="(activity, index) in conductList"
-                        :key="index"
-                        icon="el-icon-tickets"
-                        size="large"
-                        type="warning"
-                        color="#67C23A"
-                        :timestamp="parseTime(activity.createTime)"
-                      >
-                        <div class="u-flex u-flex-between">
-                          <div>{{ activity.name }}</div>
-                          <!-- <div class="delicon" @click.stop="delconduct(index)"><i class="el-icon-delete" /></div> -->
-                        </div>
-                        <div>{{ activity.recordInfo }}</div>
-                      </el-timeline-item>
-                    </el-timeline>
-                  </div>
-                  <el-empty v-else description="暂无数据" :image="zanwu" />
-                </el-tab-pane>
-                <el-tab-pane v-if="taskDetail.audioUrl" label="Ai通话" name="3">
-                  <div class="audio_wrapper">
-                    <aplayer :music="musics" repeat="repeat-all" class="aplayer-pic" :style="{ width: '100%'}" />
-                  </div>
-                </el-tab-pane>
-              </el-tabs>
-            </div>
-          </div>
-        </div>
-      </div>
-    </el-drawer>
-  </div>
-</template>
-
-<script>
-import crudUser from '@/api/system/user'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import DateRangePicker from '@/components/DateRangePicker'
-import { clueUpdate, conductQuery, reportDetails, downloadDetail, clueReceive } from '@/api/index'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import { mapGetters } from 'vuex'
-import { downloadFile } from '@/utils/index'
-import zanwu from '@/assets/images/zanwu.png'
-import payMp3 from '@/assets/images/mp3.png'
-import aplayer from 'vue-aplayer'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { channelList } from '@/api/channelLabel/index'
-const defaultForm = {}
-export default {
-  name: 'AdminIndexList',
-  components: {
-    rrOperation,
-    pagination,
-    DateRangePicker,
-    aplayer
-  },
-  cruds() {
-    return CRUD({
-      title: '线索公海',
-      url: 'api-source/source/clue/publicCluePool',
-      crudMethod: { ...crudUser },
-      optShow: {
-        add: false,
-        edit: false,
-        del: false,
-        download: false,
-        reset: true
-      },
-      query: {
-        companyId: JSON.parse(localStorage.getItem('userInfo')).companyId,
-        clueType: ''
-      }
-    })
-  },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  data() {
-    return {
-      height: document.documentElement.clientHeight - 180 + 'px;',
-      defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
-      zanwu: zanwu,
-      drawer: false, // 详情弹框
-      taskDetail: '',
-      direction: 'rtl',
-      labelGroup: false, // label弹框
-      remarksedit: false, // 备注编辑状态
-      clueGroup: false, // 线索弹框
-      taskRemarks: '', // 备注
-      labelBusiness: [], // 业务标签
-      loadingCall: '', // 点呼呼叫loading
-      telVisible: false,
-      paytelVisible: false,
-      gridData: [],
-      callMode: '', // 呼叫方式
-      callProp: false, // 呼叫弹框
-      codeName: 10, // 确认拨打倒计时
-      timeObj: null, // 时间对象
-      codeDisabled: false,
-      tabActive: '1',
-      isShowbtn: false, // 拨打电话按钮
-      uodateRowIndex: '', // 当前操作row下标
-      nameTooltip: false, // name的tooltip
-      addUserProp: false, // 添加好友弹框
-      addressTooltip: false,
-      processChecked: false, // 线索阶段
-      processActive: 0, // 线索阶段
-      conductList: [], // 记录列表
-      callRecordObj: '', // 通话记录
-      palyTime: '00:00',
-      payTimeObj: null,
-      templateValue: '',
-      templateList: [],
-      defaultVerificationtext: '', // 默认验证
-      stageBScroll: null, // 业务阶段
-      debounce: false, // 防抖
-      musics: {
-        src: '',
-        title: 'Ai语音',
-        artist: '',
-        pic: payMp3
-      },
-      adduserData: { // 添加企微好友
-        account: '',
-        phone: '',
-        verification: '',
-        id: ''
-      },
-      cluesDrawState: [
-        {
-          key: '可领取',
-          value: 1
-        },
-        {
-          key: '公示中',
-          value: 0
-        }
-      ],
-      channelSource: [],
-      cluestage: [
-        {
-          key: '新线索',
-          value: 0
-        }, {
-          key: '待再次沟通',
-          value: 1
-        }, {
-          key: '有效',
-          value: 2
-        }, {
-          key: '已加微信',
-          value: 3
-        }, {
-          key: '高意向',
-          value: 4
-        }, {
-          key: '邀请中',
-          value: 5
-        }, {
-          key: '到场',
-          value: 6
-        },
-        {
-          key: '已成交',
-          value: 7
-        },
-        {
-          key: '无意向',
-          value: 8
-        }
-      ],
-      cluestageUp: [
-        {
-          key: '新线索',
-          value: 0
-        }, {
-          key: '待再次沟通',
-          value: 1
-        }, {
-          key: '有效',
-          value: 2
-        }, {
-          key: '已加微信',
-          value: 3
-        }, {
-          key: '高意向',
-          value: 4
-        }, {
-          key: '邀请中',
-          value: 5
-        }, {
-          key: '到场',
-          value: 6
-        },
-        {
-          key: '已成交',
-          value: 7
-        }
-      ],
-      cluesState: [
-        {
-          key: '未跟进',
-          value: 0
-        }, {
-          key: '跟进中',
-          value: 1
-        }, {
-          key: '已结束',
-          value: 2
-        }
-      ],
-      conversationState: [
-        {
-          key: '未拨打',
-          value: 0
-        }, {
-          key: '未接听',
-          value: 1
-        }, {
-          key: '已接通',
-          value: 2
-        }
-      ]
-    }
-  },
-  computed: {
-    ...mapGetters(['user', 'databaseUploadApi', 'callStatus'])
-  },
-  watch: {
-    '$store.getters.callStatus': {
-      handler(newV, oldV) {
-        if (newV === 'ended' || newV === 'failed') {
-          this.paytelVisible = false
-          clearInterval(this.payTimeObj)
-          this.loadingCall.close()
-        }
-      },
-      deep: true
-    }
-  },
-  created() {
-    this.getChannelList()
-  },
-  mounted: function() {
-    const that = this
-    window.onresize = function temp() {
-      that.height = document.documentElement.clientHeight - 180 + 'px;'
-    }
-  },
-  methods: {
-    async getChannelList() {
-      const res = await channelList({ isSalesman: true })
-      this.channelSource = JSON.parse(JSON.stringify(res.data))
-    },
-    // 语音列表
-    callRecord() {
-      reportDetails({ clueId: this.taskDetail.clueId }).then(res => {
-        if (res.status === 0) {
-          this.callRecordObj = res.data
-        }
-      }).catch()
-    },
-    // 语音下载
-    downfile() {
-      downloadDetail({ clueId: this.taskDetail.clueId }).then(res => {
-        downloadFile(res, '通话记录', 'xlsx')
-        // if (res.status === 0) {
-        //   const newUrl = res.replace('http', 'https')
-        //   window.open(newUrl, '_self')
-        // }
-      })
-    },
-    onCopy(text) {
-      const that = this
-      if (!text) return false
-      that.$copyText(text + '').then(
-        function(e) {
-          that.$message.success('内容已复制到剪切板！')
-        },
-        function(e) {
-          that.$message.error('抱歉，复制失败，请手动复制')
-        }
-      )
-    },
-    // 编辑线索状态
-    UpdateFun(obj) {
-      if (!this.debounce) {
-        this.debounce = true
-        const { type, index = null } = obj
-        const data = {
-          clueId: index != null ? this.crud.data[index].id : this.taskDetail.clueId,
-          optimisticVersion: index != null ? this.crud.data[index].optimisticVersion : this.taskDetail.optimisticVersion
-        }
-        if (type === 'receive') {
-          data.memberStatus = 2
-          this.$confirm('请确定要领取该条线索吗?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.clueReceive(this.crud.data[index])
-          }).catch(() => {})
-        }
-        if (type === 'labsub') {
-          const arr = []
-          const labelArr = [...this.taskDetail.baseLabel, ...this.taskDetail.organizeLabel]
-          labelArr.forEach((item) => {
-            if (item.state === true) return arr.push(item.name)
-          })
-          data.sourceLabel = arr
-          this.clueUpdate(type, data, this.taskDetail)
-        }
-        setTimeout(() => {
-          this.debounce = false
-        }, 1000)
-      }
-    },
-    clueUpdate(type, data = {}, obj) {
-      const loading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      clueUpdate(data).then(res => {
-        loading.close()
-        if (res.status === 0) {
-          this.$message({
-            type: 'success',
-            message: '操作成功'
-          })
-          if (type === 'end') return this.crud.toQuery()
-          if (type === 'labsub') {
-            this.labelGroup = false
-            this.rowClick(obj)
-          }
-          if (type === 'upClue' || type === 'endClue' || type === 'delLabelsub') return this.rowClick(obj)
-        }
-      }).catch(() => {
-        loading.close()
-      })
-    },
-    // 线索自领取
-    clueReceive(params) {
-      clueReceive({ clueId: params.clueId, memberId: this.user.id }).then(res => {
-        this.$message.success('操作成功')
-        this.crud.refresh()
-      })
-    },
-    // 日志记录
-    conductQuery() {
-      const loading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      conductQuery({ clueId: this.taskDetail.clueId }).then(res => {
-        loading.close()
-        this.conductList = res
-      }).catch(() => { loading.close() })
-    },
-    tabClick(e) {
-      if (e.name === '1') {
-        this.callRecord()
-      } else if (e.name === '2') {
-        this.conductQuery()
-      }
-    },
-    tableRowClassName({ row, rowIndex }) {
-      row.index = rowIndex
-    },
-    // 状态比对
-    statecCmparison(name, val) {
-      return this[name].filter(item => { return item.value === val })[0].key
-    },
-    // toolip 显示控制
-    onMouseover(str) {
-      const tag = this.$refs[str]
-      const parentWidth = tag.parentNode.offsetWidth // 父级元素宽度
-      const contentWidth = tag.offsetWidth // 获取元素可视宽度
-      this[str] = contentWidth <= parentWidth
-    },
-    // 打开详情
-    rowClick(row) {
-      if (!row) return false
-      this.crud.loading = true
-      this.taskDetail = row
-      this.musics.src = row.audioUrl
-      this.tabActive = '1'
-      this.crud.loading = false
-      this.callRecord()
-      this.drawer = true
-      // clueQuery({ memberId: this.user.id, id: row.clueId }).then(res => {
-      //   this.taskDetail = res[0]
-      //   if (res[0].clueStage === 4) {
-      //     this.processActive = 1
-      //     this.processChecked = true
-      //   } else {
-      //     this.processActive = res[0].clueStage
-      //   }
-      //   this.tabActive = '1'
-      //   this.crud.loading = false
-      //   this.callRecord()
-      //   this.drawer = true
-      // }).catch(() => {
-      //   this.crud.loading = false
-      // })
-    },
-    drawerClose() {
-      this.telVisible = false
-      this.paytelVisible = false
-      this.taskRemarks = ''
-      this.crud.refresh()
-    }
-  },
-  beforeRouteLeave(to, from, next) {
-    next()
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-::v-deep .vue-treeselect__control,
-::v-deep .vue-treeselect__placeholder,
-::v-deep .vue-treeselect__single-value {
-  height: 30px;
-  line-height: 30px;
-}
-.blue {
-  color: #1890ff!important;
-}
-.ct-text {
-  display: flex;
-  align-items: center;
-  overflow-x: scroll;
-  flex-wrap: nowrap;
-  .ct-item {
-    display: flex;
-    align-items: center;
-    flex-wrap: nowrap;
-    min-width: 150px;
-  }
-}
-.remark-lbael {
-  width: 100px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.label-img {
-  display: flex;
-  align-items: center;
-  .iconimg {
-    width: 18px;
-    margin-right: 6px;
-  }
-}
-.call-conent {
-  text-align: center;
-  .add-title {
-    width: 130px;
-    text-align: right;
-    padding-right: 3px;
-  }
-  .callImg {
-    width: 40px;
-    height: 40px;
-  }
-  .item {
-    margin-bottom: 15px;
-  }
-  .code-div {
-    font-weight: bold;
-    font-size: 17px;
-  }
-  .red {
-    color: red;
-  }
-}
-.popover {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  .h3 {
-    font-size: 15px;
-    font-weight: bold;
-  }
-  img:nth-child(1) {
-    height: 45px;
-    width: 45px;
-    margin-right: 5px;
-  }
-  img:nth-child(2) {
-    height: 35px;
-    width: 35px;
-    cursor: pointer;
-  }
-  .time {
-    color: red;
-    font-size: 13px;
-  }
-}
-.tel-record {
-  color: #409eff;
-  border: none;
-  padding: 0;
-}
-.save-btn {
-  float: right;
-  margin-top: 15px;
-}
-.Disable {
-  opacity: 0.5;
-  .scroll-item {
-    cursor: no-drop!important;
-  }
-}
-.remark-lbael {
-  width: 130px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.drawer-con {
-  position: relative;
-  .group-top {
-    display: flex;
-    align-items: center;
-    position: fixed;
-    top: 0;
-    width: 600px;
-    background: #fff;
-    z-index: 3;
-    div {
-      font-size: 15px;
-      color: #333;
-      font-weight: 600;
-    }
-    .top-block {
-      width: 100%;
-      border-bottom: 1px solid #e4e9ed;
-      height: 56px;
-      padding: 0 20px;
-    }
-    .username {
-      color: #23272e;
-      font-size: 16px;
-      font-weight: 600;
-      line-height: 24px;
-      margin-right: 8px;
-    }
-    .update-img {
-      width: 18px;
-      height: 18px;
-      margin-left: 20px;
-      cursor: pointer;
-    }
-  }
-  .information {
-    margin-top: 56px;
-    background: #f8f9fa;
-    display: flex;
-    flex-wrap: wrap;
-    padding: 12px 20px 8px;
-    .information-item {
-      display: flex;
-      font-size: 14px;
-      height: 22px;
-      line-height: 22px;
-      margin-bottom: 8px;
-    }
-    .information-label {
-      width: 90px;
-      color: #8f949c;
-      margin-right: 8px;
-    }
-    .it-line {
-      width: 220px;
-      color: #23272e;
-    }
-  }
-  .detail-title {
-    color: #23272e;
-    font-size: 14px;
-    font-style: normal;
-    font-weight: 500;
-    line-height: 22px;
-    width: auto;
-    padding: 0 20px;
-  }
-  .scroll-wrapper {
-    position: relative;
-    width: 100%;
-    white-space: nowrap;
-    overflow: hidden;
-    .scroll-content {
-      display: inline-block;
-      white-space: nowrap;
-    }
-    .scroll-item {
-      display: inline-block;
-      height: 45px;
-      line-height: 45px;
-      background: #f5f7fa;
-    }
-    .scroll-item :hover {
-      cursor: pointer;
-    }
-    .scroll-item div:nth-child(1) {
-      display: inline-block;
-      width: 100px;
-      font-size: 13px;
-      text-align: center;
-      color: #c0c4cc;
-    }
-  }
-  .labelCon {
-    // padding: 8px 20px;
-    .buttom-column {
-      margin-top: 15px;
-      display: flex;
-      justify-content: flex-end;
-      align-items: center;
-    }
-    .remarksClass {
-      padding: 0 20px;
-      border-radius: 4px;
-      margin-bottom: 8px;
-      width: 100%;
-    }
-    .labelInformation {
-      background: #f8f9fa;
-      border-radius: 4px;
-      padding: 10px 16px;
-      margin: 10px 16px;
-    }
-    .label-bottom {
-      margin-top: 13px;
-    }
-  }
-  .blue{
-    color: #338aff;
-  }
-  .customer-title {
-      padding-bottom: 18px;
-      border-bottom: 1px solid #999999;
-      div {
-        padding-left: 10px;
-      }
-  }
-  .a {
-    color: #338aff;
-    cursor: pointer;
-    font-size: 14px;
-    &:hover {
-      color: rgb(32, 160, 255);
-    }
-  }
-}
-
-.group-conent {
-  margin-top: -15px;
-}
-.red{
-  color: red;
-}
-.labelGroup {
-  flex-wrap: wrap;
-  div{
-    margin-right: 6px;
-  }
-}
-
-.recordCon {
-  .phoneicon {
-    color: #67C23A;
-  }
-  .toplink {
-    font-size: 14px;
-    font-weight: 500;
-    color: #303133;;
-  }
-  .state {
-    font-size: 14px;
-    font-weight: 500;
-    color: red;
-  }
-  .success {
-    color: #67C23A;
-  }
-  .audio {
-    width: 100%;
-    height: 40px;
-    margin-top: 10px;
-  }
-}
-.label{
-  min-width: 80px;
-  line-height: 32px;
-  float: none;
-  display: inline-block;
-  font-size: 14px;
-  color: #606266;
-  text-align: left;
-  vertical-align: middle;
-  font-weight: 700;
-  padding: 0 20px 0 10px;
-}
-.label-item {
-  padding: 9px 15px;
-  font-size: 12px;
-  border-radius: 3px;
-  color: #409eff;
-  background: #ECF5FF;
-  border: 1px solid #d9ecff;
-  position: relative;
-  border-radius: 4px;
-  cursor: pointer;
-  i {
-    position: absolute;
-    bottom: 2px;
-    right: 2px;
-    color: red;
-  }
-}
-.el-menu {
-  border-right: none;
-}
-.taskmean {
-  .task-conent {
-    padding-bottom: 20px;
-    border-bottom: 1px solid #E6E7EB;
-  }
-  .addBtn {
-    background: #5757D9;
-    border: 1px solid #5757D9;
-    padding: 11px 25px;
-  }
-}
-.tabCon {
-  padding: 13px 20px;
-  .overview {
-    align-items: center;
-    border: 1px solid #eff0f1;
-    border-radius: 4px;
-    margin-top: 8px;
-    padding: 10px 0 10px 24px;
-  }
-  .Statistics {
-    color: #23272e;
-    font-size: 16px;
-    font-weight: 500;
-    line-height: 24px;
-  }
-  .audio_time {
-    font-size: 12px;
-    color: #8f949c;
-    text-align: right;
-    margin-top: 5px;
-  }
-  .t-title {
-    color: #8f949c;
-    font-size: 12px;
-    line-height: 20px;
-  }
-  .tab-pan {
-    padding: 13px 0;
-  }
-  .delicon {
-    cursor: pointer;
-    i:hover {
-      color: #0084FF;
-    }
-  }
-  .down {
-    font-size: 12px;
-    i {
-      margin-right: 5px;
-    }
-  }
-  .title {
-    color: #222;
-    font-size: 14px;
-    font-weight: 500;
-    line-height: 22px;
-    margin: 0 5px 0 8px;
-  }
-  ::v-deep .el-timeline-item__content {
-    line-height: 22px;
-  }
-}
-.top-conent {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 10px 20px;
-  border-bottom: 10px solid #F5F5F7;
-  img {
-    width: 35px;
-    height: 35px;
-    border-radius: 50%;
-  }
-}
-.addicon {
-  font-size: 14px;
-  color: #409eff;
-}
-</style>
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--用户数据-->
+      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+        <!--工具栏-->
+        <div class="head-container">
+          <div class="u-flex u-flex-wrap">
+            <!-- 搜索 -->
+            <div class="u-flex">
+              <label class="y-label">客户名称：</label>
+              <el-input
+                v-model="query.name"
+                clearable
+                size="small"
+                placeholder="请输入"
+                style="width: 170px;"
+                class="filter-item"
+                @keyup.enter.native="crud.toQuery"
+              />
+            </div>
+            <div class="u-flex">
+              <label class="y-label">标签名称：</label>
+              <el-input
+                v-model="query.label"
+                clearable
+                size="small"
+                placeholder="请输入"
+                style="width: 170px;"
+                class="filter-item"
+                @keyup.enter.native="crud.toQuery"
+              />
+            </div>
+            <div class="u-flex">
+              <label class="y-label">渠道标签：</label>
+              <el-select
+                v-model="query.routeId"
+                clearable
+                size="small"
+                placeholder="请选择"
+                class="filter-item"
+                style="width: 170px"
+                @change="crud.toQuery"
+              >
+                <el-option
+                  v-for="item in channelSource"
+                  :key="item.id"
+                  :label="item.routeName"
+                  :value="item.id"
+                />
+              </el-select>
+            </div>
+            <div class="u-flex">
+              <label class="y-label">呼叫状态：</label>
+              <el-select
+                v-model="query.clueCallStatus"
+                clearable
+                size="small"
+                placeholder="请选择"
+                class="filter-item"
+                style="width: 170px"
+                @change="crud.toQuery"
+              >
+                <el-option
+                  v-for="item in conversationState"
+                  :key="item.value"
+                  :label="item.key"
+                  :value="item.value"
+                />
+              </el-select>
+            </div>
+            <div class="u-flex">
+              <label class="y-label">线索状态：</label>
+              <el-select
+                v-model="query.status"
+                clearable
+                size="small"
+                placeholder="请选择"
+                class="filter-item"
+                style="width: 170px"
+                @change="crud.toQuery"
+              >
+                <el-option
+                  v-for="item in cluesDrawState"
+                  :key="item.value"
+                  :label="item.key"
+                  :value="item.value"
+                />
+              </el-select>
+            </div>
+            <div class="u-flex">
+              <label class="y-label">线索阶段：</label>
+              <el-select
+                v-model="query.clueStage"
+                clearable
+                size="small"
+                placeholder="请选择"
+                class="filter-item"
+                style="width: 170px"
+                @change="crud.toQuery"
+              >
+                <el-option
+                  v-for="item in cluestage"
+                  :key="item.value"
+                  :label="item.key"
+                  :value="item.value"
+                />
+              </el-select>
+            </div>
+            <div class="u-flex">
+              <label class="y-label">呼叫日期：</label>
+              <date-range-picker v-model="query.newestCallTime" start-placeholder="上次呼叫开始" end-placeholder="上次呼叫结束" class="date-item" />
+            </div>
+            <rrOperation style="margin-left: 5px;" />
+          </div>
+        </div>
+        <!--表格渲染-->
+        <el-table ref="table" v-loading="crud.loading" style="width: 100%;" :data="crud.data" :header-cell-style="{'text-align':'left'}" :row-class-name="tableRowClassName">
+          <el-table-column :show-overflow-tooltip="true" prop="clueId" label="ID" width="80" />
+          <el-table-column :show-overflow-tooltip="true" prop="clueName" label="姓名" />
+          <el-table-column :show-overflow-tooltip="true" prop="clueCallStatus" label="上次通话状态" width="100">
+            <template slot-scope="scope">
+              <div>{{ statecCmparison('conversationState', scope.row.clueCallStatus) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column width="180" label="标签">
+            <template slot-scope="scope">
+              <el-popover trigger="hover" placement="top">
+                <el-tag v-for="(item, index) in scope.row.sourceLabel" :key="index" type="info" class="mr-5" :class="'color'+ index">{{ item }}</el-tag>
+                <div slot="reference" class="name-wrapper u-flex">
+                  <el-tag v-for="(item, index) in scope.row.sourceLabel" :key="index" type="info" class="mr-5" :class="'color'+ index">{{ item }}</el-tag>
+                </div>
+              </el-popover>
+            </template>
+          </el-table-column>
+          <el-table-column :show-overflow-tooltip="true" prop="status" label="线索状态">
+            <template slot-scope="scope">
+              <el-tag :type="scope.row.status == 1 ? 'success' : ''">{{ scope.row.status == 1 ? '可领取' : '公示中' }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column :show-overflow-tooltip="true" prop="clueStage" label="线索阶段">
+            <template slot-scope="scope">
+              <div>{{ statecCmparison('cluestage', scope.row.clueStage) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column :show-overflow-tooltip="true" width="130" prop="clueRecord" label="最新跟进记录">
+            <template slot-scope="scope">
+              <div class="remark-lbael">{{ scope.row.clueRecord }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column :show-overflow-tooltip="true" prop="newestCallTime" label="上次呼叫时间" width="130">
+            <template slot-scope="scope">
+              <div>{{ parseTime(scope.row.newestCallTime) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            fixed="right"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="rowClick(scope.row)"
+              >详情</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                :disabled="scope.row.status != 1"
+                @click.stop="UpdateFun({type: 'receive', index: scope.$index})"
+              >领取</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!--分页组件-->
+        <pagination />
+      </el-col>
+      <!-- <el-col :xs="24" :sm="24" :md="5" :lg="5" :xl="5">
+        <Message />
+      </el-col> -->
+    </el-row>
+    <!-- 单个详情 -->
+    <el-drawer
+      title="客户管理"
+      :visible.sync="drawer"
+      :direction="direction"
+      :with-header="false"
+      :modal="false"
+      size="700px"
+      @close="drawerClose"
+    >
+      <div v-if="taskDetail" class="drawer-con">
+        <div v-if="taskDetail.clueName" class="group-top">
+          <div class="u-flex u-flex-between top-block">
+            <div class="u-flex">
+              <div class="text-hide-2 username">{{ taskDetail.clueName }}</div>
+            </div>
+          </div>
+        </div>
+        <!-- <div>
+          <div class="information">
+            <div class="u-flex information-item">
+              <label class="information-label">线索跟进人</label>
+              <el-tooltip :disabled="nameTooltip" class="item" effect="dark" :content="taskDetail.distributeUserName" placement="top-start">
+                <div class="it-line text-hide" @mouseover="onMouseover('nameTooltip')">
+                  <span ref="nameTooltip">{{ taskDetail.distributeUserName || '-' }}</span>
+                </div>
+              </el-tooltip>
+            </div>
+            <div class="u-flex information-item">
+              <label class="information-label">线索创建时间</label>
+              <div class="it-line text-hide">{{ parseTime(taskDetail.createTime) }}</div>
+            </div>
+            <div class="u-flex information-item">
+              <label class="information-label">电话</label>
+              <div class="it-line text-hide">{{ taskDetail.nid }}</div>
+            </div>
+            <div class="u-flex information-item">
+              <label class="information-label">微信</label>
+              <div class="it-line text-hide">{{ taskDetail.wx }} <span v-if="taskDetail.wx" class="a ml-5" @click="onCopy(taskDetail.wx)">复制</span></div>
+            </div>
+            <div class="u-flex information-item">
+              <label class="information-label">金额</label>
+              <div class="it-line text-hide">{{ taskDetail.amount }}</div>
+            </div>
+            <div class="u-flex information-item">
+              <label class="information-label">平台</label>
+              <div class="it-line text-hide">{{ taskDetail.platform || '未知' }}</div>
+            </div>
+            <div class="u-flex information-item">
+              <label class="information-label">线索渠道</label>
+              <div class="it-line text-hide">{{ statecCmparison('channelSource', taskDetail.origin) }} - 外部导入</div>
+            </div>
+            <div class="u-flex information-item">
+              <label class="information-label">线索归属地</label>
+              <el-tooltip :disabled="addressTooltip" class="item" effect="dark" :content="taskDetail.address" placement="top-start">
+                <div class="it-line text-hide" @mouseover="onMouseover('addressTooltip')">
+                  <span ref="addressTooltip">{{ taskDetail.address || '无信息' }}</span>
+                </div>
+              </el-tooltip>
+            </div>
+            <div class="u-flex information-item" style="align-items: center">
+              <label class="information-label">操作状态</label>
+              <div class="it-line text-hide label-img">
+                <img v-if="taskDetail.addWeChatStatus != 1" src="@/assets/images/qwcode-h.png" class="iconimg" alt="">
+                <el-tooltip v-else class="item" effect="dark" :content="parseTime(taskDetail.addWeChatTime)" placement="top">
+                  <img src="@/assets/images/qwcode.png" class="iconimg" alt="">
+                </el-tooltip>
+              </div>
+            </div>
+          </div>
+        </div> -->
+        <div :style="{'margin-top': (taskDetail.clueName ? '56px' : '0px')}">
+          <div v-if="taskDetail.sourceLabel.length > 0" class="labelCon">
+            <div class="detail-title u-flex u-flex-between"><p>线索打标</p></div>
+            <div class="labelInformation">
+              <div class="label-top">
+                <el-tag
+                  v-for="(tag, index) in taskDetail.sourceLabel"
+                  :key="index"
+                  class="mr-5 color33"
+                  :class="'color' + index"
+                  :disable-transitions="false"
+                >
+                  {{ tag }}
+                </el-tag>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div>
+          <div class="tabCon">
+            <div>
+              <el-tabs v-model="tabActive" @tab-click="tabClick">
+                <el-tab-pane label="通话记录" name="1">
+                  <div class="u-flex u-flex-between">
+                    <div class="title">通话总览</div>
+                    <span class="a down" @click.stop="downfile"><i class="el-icon-download" />下载通话记录</span>
+                  </div>
+                  <div class="u-flex overview">
+                    <div class="flex-1">
+                      <div class="t-title">电话拨打量</div>
+                      <div class="Statistics">{{ callRecordObj.usrNum }}</div>
+                    </div>
+                    <div class="flex-1">
+                      <div class="t-title">电话接通量</div>
+                      <div class="Statistics">{{ callRecordObj.turnOnNum }}</div>
+                    </div>
+                    <div class="flex-1">
+                      <div class="t-title">电话有效沟通量</div>
+                      <div class="Statistics">{{ callRecordObj.validNum }}</div>
+                    </div>
+                  </div>
+                  <div v-if="callRecordObj" class="recordCon">
+                    <div class="u-flex u-flex-between">
+                      <div class="title mt-15">通话记录</div>
+                    </div>
+                    <div v-if="callRecordObj.data.length > 0">
+                      <div v-for="(item, index) in callRecordObj.data" :key="index" class="mt-15">
+                        <div class="u-flex u-flex-between">
+                          <div class="toplink"><i class="el-icon-phone phoneicon mr-5" />{{ item.memberName }} <span class="ml-5 mr-5">打给</span>{{ item.clueName }}</div>
+                          <div class="state" :class="{ 'success' : item.status == 2 }">{{ item.status == 1 ? '未接通' : '已打通' }}</div>
+                        </div>
+                        <div class="audio_wrapper">
+                          <audio :src="item.recordFileDownloadUrl" controls class="audio" />
+                          <div class="audio_time">{{ parseTime(item.createTime) }}呼出</div>
+                        </div>
+                      </div>
+                    </div>
+                    <el-empty v-else description="暂无通话记录" :image="zanwu" />
+                  </div>
+                </el-tab-pane>
+                <el-tab-pane label="跟进记录" name="2">
+                  <div v-if="conductList.length > 0" class="tab-pan">
+                    <el-timeline :reverse="true">
+                      <el-timeline-item
+                        v-for="(activity, index) in conductList"
+                        :key="index"
+                        icon="el-icon-tickets"
+                        size="large"
+                        type="warning"
+                        color="#67C23A"
+                        :timestamp="parseTime(activity.createTime)"
+                      >
+                        <div class="u-flex u-flex-between">
+                          <div>{{ activity.name }}</div>
+                          <!-- <div class="delicon" @click.stop="delconduct(index)"><i class="el-icon-delete" /></div> -->
+                        </div>
+                        <div>{{ activity.recordInfo }}</div>
+                      </el-timeline-item>
+                    </el-timeline>
+                  </div>
+                  <el-empty v-else description="暂无数据" :image="zanwu" />
+                </el-tab-pane>
+                <el-tab-pane v-if="taskDetail.audioUrl" label="Ai通话" name="3">
+                  <div class="audio_wrapper">
+                    <aplayer :music="musics" repeat="repeat-all" class="aplayer-pic" :style="{ width: '100%'}" />
+                  </div>
+                </el-tab-pane>
+              </el-tabs>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import crudUser from '@/api/system/user'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import DateRangePicker from '@/components/DateRangePicker'
+import { clueUpdate, conductQuery, reportDetails, downloadDetail, clueReceive } from '@/api/index'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import { mapGetters } from 'vuex'
+import { downloadFile } from '@/utils/index'
+import zanwu from '@/assets/images/zanwu.png'
+import payMp3 from '@/assets/images/mp3.png'
+import aplayer from 'vue-aplayer'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { channelList } from '@/api/channelLabel/index'
+const defaultForm = {}
+export default {
+  name: 'AdminIndexList',
+  components: {
+    rrOperation,
+    pagination,
+    DateRangePicker,
+    aplayer
+  },
+  cruds() {
+    return CRUD({
+      title: '线索公海',
+      url: 'api-source/source/clue/publicCluePool',
+      crudMethod: { ...crudUser },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      },
+      query: {
+        companyId: JSON.parse(localStorage.getItem('userInfo')).companyId,
+        clueType: ''
+      }
+    })
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
+      zanwu: zanwu,
+      drawer: false, // 详情弹框
+      taskDetail: '',
+      direction: 'rtl',
+      labelGroup: false, // label弹框
+      remarksedit: false, // 备注编辑状态
+      clueGroup: false, // 线索弹框
+      taskRemarks: '', // 备注
+      labelBusiness: [], // 业务标签
+      loadingCall: '', // 点呼呼叫loading
+      telVisible: false,
+      paytelVisible: false,
+      gridData: [],
+      callMode: '', // 呼叫方式
+      callProp: false, // 呼叫弹框
+      codeName: 10, // 确认拨打倒计时
+      timeObj: null, // 时间对象
+      codeDisabled: false,
+      tabActive: '1',
+      isShowbtn: false, // 拨打电话按钮
+      uodateRowIndex: '', // 当前操作row下标
+      nameTooltip: false, // name的tooltip
+      addUserProp: false, // 添加好友弹框
+      addressTooltip: false,
+      processChecked: false, // 线索阶段
+      processActive: 0, // 线索阶段
+      conductList: [], // 记录列表
+      callRecordObj: '', // 通话记录
+      palyTime: '00:00',
+      payTimeObj: null,
+      templateValue: '',
+      templateList: [],
+      defaultVerificationtext: '', // 默认验证
+      stageBScroll: null, // 业务阶段
+      debounce: false, // 防抖
+      musics: {
+        src: '',
+        title: 'Ai语音',
+        artist: '',
+        pic: payMp3
+      },
+      adduserData: { // 添加企微好友
+        account: '',
+        phone: '',
+        verification: '',
+        id: ''
+      },
+      cluesDrawState: [
+        {
+          key: '可领取',
+          value: 1
+        },
+        {
+          key: '公示中',
+          value: 0
+        }
+      ],
+      channelSource: [],
+      cluestage: [
+        {
+          key: '新线索',
+          value: 0
+        }, {
+          key: '待再次沟通',
+          value: 1
+        }, {
+          key: '有效',
+          value: 2
+        }, {
+          key: '已加微信',
+          value: 3
+        }, {
+          key: '高意向',
+          value: 4
+        }, {
+          key: '邀请中',
+          value: 5
+        }, {
+          key: '到场',
+          value: 6
+        },
+        {
+          key: '已成交',
+          value: 7
+        },
+        {
+          key: '无意向',
+          value: 8
+        }
+      ],
+      cluestageUp: [
+        {
+          key: '新线索',
+          value: 0
+        }, {
+          key: '待再次沟通',
+          value: 1
+        }, {
+          key: '有效',
+          value: 2
+        }, {
+          key: '已加微信',
+          value: 3
+        }, {
+          key: '高意向',
+          value: 4
+        }, {
+          key: '邀请中',
+          value: 5
+        }, {
+          key: '到场',
+          value: 6
+        },
+        {
+          key: '已成交',
+          value: 7
+        }
+      ],
+      cluesState: [
+        {
+          key: '未跟进',
+          value: 0
+        }, {
+          key: '跟进中',
+          value: 1
+        }, {
+          key: '已结束',
+          value: 2
+        }
+      ],
+      conversationState: [
+        {
+          key: '未拨打',
+          value: 0
+        }, {
+          key: '未接听',
+          value: 1
+        }, {
+          key: '已接通',
+          value: 2
+        }
+      ]
+    }
+  },
+  computed: {
+    ...mapGetters(['user', 'databaseUploadApi', 'callStatus'])
+  },
+  watch: {
+    '$store.getters.callStatus': {
+      handler(newV, oldV) {
+        if (newV === 'ended' || newV === 'failed') {
+          this.paytelVisible = false
+          clearInterval(this.payTimeObj)
+          this.loadingCall.close()
+        }
+      },
+      deep: true
+    }
+  },
+  created() {
+    this.getChannelList()
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  methods: {
+    async getChannelList() {
+      const res = await channelList({ isSalesman: true })
+      this.channelSource = JSON.parse(JSON.stringify(res.data))
+    },
+    // 语音列表
+    callRecord() {
+      reportDetails({ clueId: this.taskDetail.clueId }).then(res => {
+        if (res.status === 0) {
+          this.callRecordObj = res.data
+        }
+      }).catch()
+    },
+    // 语音下载
+    downfile() {
+      downloadDetail({ clueId: this.taskDetail.clueId }).then(res => {
+        downloadFile(res, '通话记录', 'xlsx')
+        // if (res.status === 0) {
+        //   const newUrl = res.replace('http', 'https')
+        //   window.open(newUrl, '_self')
+        // }
+      })
+    },
+    onCopy(text) {
+      const that = this
+      if (!text) return false
+      that.$copyText(text + '').then(
+        function(e) {
+          that.$message.success('内容已复制到剪切板！')
+        },
+        function(e) {
+          that.$message.error('抱歉，复制失败，请手动复制')
+        }
+      )
+    },
+    // 编辑线索状态
+    UpdateFun(obj) {
+      if (!this.debounce) {
+        this.debounce = true
+        const { type, index = null } = obj
+        const data = {
+          clueId: index != null ? this.crud.data[index].id : this.taskDetail.clueId,
+          optimisticVersion: index != null ? this.crud.data[index].optimisticVersion : this.taskDetail.optimisticVersion
+        }
+        if (type === 'receive') {
+          data.memberStatus = 2
+          this.$confirm('请确定要领取该条线索吗?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.clueReceive(this.crud.data[index])
+          }).catch(() => {})
+        }
+        if (type === 'labsub') {
+          const arr = []
+          const labelArr = [...this.taskDetail.baseLabel, ...this.taskDetail.organizeLabel]
+          labelArr.forEach((item) => {
+            if (item.state === true) return arr.push(item.name)
+          })
+          data.sourceLabel = arr
+          this.clueUpdate(type, data, this.taskDetail)
+        }
+        setTimeout(() => {
+          this.debounce = false
+        }, 1000)
+      }
+    },
+    clueUpdate(type, data = {}, obj) {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      clueUpdate(data).then(res => {
+        loading.close()
+        if (res.status === 0) {
+          this.$message({
+            type: 'success',
+            message: '操作成功'
+          })
+          if (type === 'end') return this.crud.toQuery()
+          if (type === 'labsub') {
+            this.labelGroup = false
+            this.rowClick(obj)
+          }
+          if (type === 'upClue' || type === 'endClue' || type === 'delLabelsub') return this.rowClick(obj)
+        }
+      }).catch(() => {
+        loading.close()
+      })
+    },
+    // 线索自领取
+    clueReceive(params) {
+      clueReceive({ clueId: params.clueId, memberId: this.user.id }).then(res => {
+        this.$message.success('操作成功')
+        this.crud.refresh()
+      })
+    },
+    // 日志记录
+    conductQuery() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      conductQuery({ clueId: this.taskDetail.clueId }).then(res => {
+        loading.close()
+        this.conductList = res
+      }).catch(() => { loading.close() })
+    },
+    tabClick(e) {
+      if (e.name === '1') {
+        this.callRecord()
+      } else if (e.name === '2') {
+        this.conductQuery()
+      }
+    },
+    tableRowClassName({ row, rowIndex }) {
+      row.index = rowIndex
+    },
+    // 状态比对
+    statecCmparison(name, val) {
+      return this[name].filter(item => { return item.value === val })[0].key
+    },
+    // toolip 显示控制
+    onMouseover(str) {
+      const tag = this.$refs[str]
+      const parentWidth = tag.parentNode.offsetWidth // 父级元素宽度
+      const contentWidth = tag.offsetWidth // 获取元素可视宽度
+      this[str] = contentWidth <= parentWidth
+    },
+    // 打开详情
+    rowClick(row) {
+      if (!row) return false
+      this.crud.loading = true
+      this.taskDetail = row
+      this.musics.src = row.audioUrl
+      this.tabActive = '1'
+      this.crud.loading = false
+      this.callRecord()
+      this.drawer = true
+      // clueQuery({ memberId: this.user.id, id: row.clueId }).then(res => {
+      //   this.taskDetail = res[0]
+      //   if (res[0].clueStage === 4) {
+      //     this.processActive = 1
+      //     this.processChecked = true
+      //   } else {
+      //     this.processActive = res[0].clueStage
+      //   }
+      //   this.tabActive = '1'
+      //   this.crud.loading = false
+      //   this.callRecord()
+      //   this.drawer = true
+      // }).catch(() => {
+      //   this.crud.loading = false
+      // })
+    },
+    drawerClose() {
+      this.telVisible = false
+      this.paytelVisible = false
+      this.taskRemarks = ''
+      this.crud.refresh()
+    }
+  },
+  beforeRouteLeave(to, from, next) {
+    next()
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .vue-treeselect__control,
+::v-deep .vue-treeselect__placeholder,
+::v-deep .vue-treeselect__single-value {
+  height: 30px;
+  line-height: 30px;
+}
+.blue {
+  color: #1890ff!important;
+}
+.ct-text {
+  display: flex;
+  align-items: center;
+  overflow-x: scroll;
+  flex-wrap: nowrap;
+  .ct-item {
+    display: flex;
+    align-items: center;
+    flex-wrap: nowrap;
+    min-width: 150px;
+  }
+}
+.remark-lbael {
+  width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.label-img {
+  display: flex;
+  align-items: center;
+  .iconimg {
+    width: 18px;
+    margin-right: 6px;
+  }
+}
+.call-conent {
+  text-align: center;
+  .add-title {
+    width: 130px;
+    text-align: right;
+    padding-right: 3px;
+  }
+  .callImg {
+    width: 40px;
+    height: 40px;
+  }
+  .item {
+    margin-bottom: 15px;
+  }
+  .code-div {
+    font-weight: bold;
+    font-size: 17px;
+  }
+  .red {
+    color: red;
+  }
+}
+.popover {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  .h3 {
+    font-size: 15px;
+    font-weight: bold;
+  }
+  img:nth-child(1) {
+    height: 45px;
+    width: 45px;
+    margin-right: 5px;
+  }
+  img:nth-child(2) {
+    height: 35px;
+    width: 35px;
+    cursor: pointer;
+  }
+  .time {
+    color: red;
+    font-size: 13px;
+  }
+}
+.tel-record {
+  color: #409eff;
+  border: none;
+  padding: 0;
+}
+.save-btn {
+  float: right;
+  margin-top: 15px;
+}
+.Disable {
+  opacity: 0.5;
+  .scroll-item {
+    cursor: no-drop!important;
+  }
+}
+.remark-lbael {
+  width: 130px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.drawer-con {
+  position: relative;
+  .group-top {
+    display: flex;
+    align-items: center;
+    position: fixed;
+    top: 0;
+    width: 600px;
+    background: #fff;
+    z-index: 3;
+    div {
+      font-size: 15px;
+      color: #333;
+      font-weight: 600;
+    }
+    .top-block {
+      width: 100%;
+      border-bottom: 1px solid #e4e9ed;
+      height: 56px;
+      padding: 0 20px;
+    }
+    .username {
+      color: #23272e;
+      font-size: 16px;
+      font-weight: 600;
+      line-height: 24px;
+      margin-right: 8px;
+    }
+    .update-img {
+      width: 18px;
+      height: 18px;
+      margin-left: 20px;
+      cursor: pointer;
+    }
+  }
+  .information {
+    margin-top: 56px;
+    background: #f8f9fa;
+    display: flex;
+    flex-wrap: wrap;
+    padding: 12px 20px 8px;
+    .information-item {
+      display: flex;
+      font-size: 14px;
+      height: 22px;
+      line-height: 22px;
+      margin-bottom: 8px;
+    }
+    .information-label {
+      width: 90px;
+      color: #8f949c;
+      margin-right: 8px;
+    }
+    .it-line {
+      width: 220px;
+      color: #23272e;
+    }
+  }
+  .detail-title {
+    color: #23272e;
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 22px;
+    width: auto;
+    padding: 0 20px;
+  }
+  .scroll-wrapper {
+    position: relative;
+    width: 100%;
+    white-space: nowrap;
+    overflow: hidden;
+    .scroll-content {
+      display: inline-block;
+      white-space: nowrap;
+    }
+    .scroll-item {
+      display: inline-block;
+      height: 45px;
+      line-height: 45px;
+      background: #f5f7fa;
+    }
+    .scroll-item :hover {
+      cursor: pointer;
+    }
+    .scroll-item div:nth-child(1) {
+      display: inline-block;
+      width: 100px;
+      font-size: 13px;
+      text-align: center;
+      color: #c0c4cc;
+    }
+  }
+  .labelCon {
+    // padding: 8px 20px;
+    .buttom-column {
+      margin-top: 15px;
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+    }
+    .remarksClass {
+      padding: 0 20px;
+      border-radius: 4px;
+      margin-bottom: 8px;
+      width: 100%;
+    }
+    .labelInformation {
+      background: #f8f9fa;
+      border-radius: 4px;
+      padding: 10px 16px;
+      margin: 10px 16px;
+    }
+    .label-bottom {
+      margin-top: 13px;
+    }
+  }
+  .blue{
+    color: #338aff;
+  }
+  .customer-title {
+      padding-bottom: 18px;
+      border-bottom: 1px solid #999999;
+      div {
+        padding-left: 10px;
+      }
+  }
+  .a {
+    color: #338aff;
+    cursor: pointer;
+    font-size: 14px;
+    &:hover {
+      color: rgb(32, 160, 255);
+    }
+  }
+}
+
+.group-conent {
+  margin-top: -15px;
+}
+.red{
+  color: red;
+}
+.labelGroup {
+  flex-wrap: wrap;
+  div{
+    margin-right: 6px;
+  }
+}
+
+.recordCon {
+  .phoneicon {
+    color: #67C23A;
+  }
+  .toplink {
+    font-size: 14px;
+    font-weight: 500;
+    color: #303133;;
+  }
+  .state {
+    font-size: 14px;
+    font-weight: 500;
+    color: red;
+  }
+  .success {
+    color: #67C23A;
+  }
+  .audio {
+    width: 100%;
+    height: 40px;
+    margin-top: 10px;
+  }
+}
+.label{
+  min-width: 80px;
+  line-height: 32px;
+  float: none;
+  display: inline-block;
+  font-size: 14px;
+  color: #606266;
+  text-align: left;
+  vertical-align: middle;
+  font-weight: 700;
+  padding: 0 20px 0 10px;
+}
+.label-item {
+  padding: 9px 15px;
+  font-size: 12px;
+  border-radius: 3px;
+  color: #409eff;
+  background: #ECF5FF;
+  border: 1px solid #d9ecff;
+  position: relative;
+  border-radius: 4px;
+  cursor: pointer;
+  i {
+    position: absolute;
+    bottom: 2px;
+    right: 2px;
+    color: red;
+  }
+}
+.el-menu {
+  border-right: none;
+}
+.taskmean {
+  .task-conent {
+    padding-bottom: 20px;
+    border-bottom: 1px solid #E6E7EB;
+  }
+  .addBtn {
+    background: #5757D9;
+    border: 1px solid #5757D9;
+    padding: 11px 25px;
+  }
+}
+.tabCon {
+  padding: 13px 20px;
+  .overview {
+    align-items: center;
+    border: 1px solid #eff0f1;
+    border-radius: 4px;
+    margin-top: 8px;
+    padding: 10px 0 10px 24px;
+  }
+  .Statistics {
+    color: #23272e;
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 24px;
+  }
+  .audio_time {
+    font-size: 12px;
+    color: #8f949c;
+    text-align: right;
+    margin-top: 5px;
+  }
+  .t-title {
+    color: #8f949c;
+    font-size: 12px;
+    line-height: 20px;
+  }
+  .tab-pan {
+    padding: 13px 0;
+  }
+  .delicon {
+    cursor: pointer;
+    i:hover {
+      color: #0084FF;
+    }
+  }
+  .down {
+    font-size: 12px;
+    i {
+      margin-right: 5px;
+    }
+  }
+  .title {
+    color: #222;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 22px;
+    margin: 0 5px 0 8px;
+  }
+  ::v-deep .el-timeline-item__content {
+    line-height: 22px;
+  }
+}
+.top-conent {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 20px;
+  border-bottom: 10px solid #F5F5F7;
+  img {
+    width: 35px;
+    height: 35px;
+    border-radius: 50%;
+  }
+}
+.addicon {
+  font-size: 14px;
+  color: #409eff;
+}
+</style>
diff --git a/src/views/labelManagement/index.vue b/src/views/labelManagement/index.vue
index d988013..56ef072 100644
--- a/src/views/labelManagement/index.vue
+++ b/src/views/labelManagement/index.vue
@@ -1,322 +1,322 @@
-<!--
- * @Description: 标签管理
- * @Autor: 飘泊客
- * @Date: 2022-05-23 15:20:02
- * @LastEditors: 飘泊客
- * @LastEditTime: 2023-05-16 16:53:42
--->
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div>
-        <!-- 搜索 -->
-        <label class="y-label">标签组名：</label>
-        <el-input
-          v-model="query.name"
-          clearable
-          size="small"
-          placeholder="请输入"
-          style="width: 170px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <rrOperation />
-      </div>
-      <crudOperation show="" :permission="permission" />
-    </div>
-    <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" :header-cell-style="{'text-align':'left'}" @selection-change="crud.selectionChangeHandler">
-      <el-table-column type="selection" width="55" />
-      <el-table-column :show-overflow-tooltip="true" prop="name" label="标签组名" />
-      <el-table-column :show-overflow-tooltip="true" prop="labelList" label="标签">
-        <template slot-scope="scope">
-          <div class="u-flex">
-            <div v-for="item in scope.row.labelList" :key="item.id" class="mr-5">
-              <el-tag>{{ item.labelName }}</el-tag>
-            </div>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="isEnable" label="是否开启">
-        <template slot-scope="scope">
-          <el-switch v-model="scope.row.isEnable" active-color="#246fdc" :active-value="1" :inactive-value="0" @change="quickUpdate(scope.row)" />
-        </template>
-      </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="操作"
-        width="140"
-        fixed="right"
-      >
-        <template slot-scope="scope">
-          <udOperation
-            :data="scope.row"
-            :permission="permission"
-            @customEdit="editLabel"
-          />
-        </template>
-      </el-table-column>
-      <template #empty>
-        <div style="width: 100%; height: 450px;display: flex; flex-direction: column; justify-content: center;align-items: center">
-          <img src="@/assets/images/zanwu.png" alt="">
-          <div>暂无数据</div>
-        </div>
-      </template>
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-    <el-dialog
-      append-to-body
-      :close-on-click-modal="false"
-      :before-close="cancelCU"
-      :visible.sync="crud.status.cu > 0"
-      title="标签管理"
-      width="520px"
-    >
-      <el-form
-        ref="form"
-        :inline="true"
-        :rules="rules"
-        :model="form"
-        size="small"
-        label-width="80px"
-      >
-        <el-form-item label="标签组名" prop="name">
-          <el-input v-model="form.name" style="width: 340px" />
-        </el-form-item>
-        <el-form-item label="是否开启">
-          <el-switch v-model="form.isEnable" active-color="#246fdc" :active-value="1" :inactive-value="0" />
-        </el-form-item>
-        <div class="u-flex mb-15">
-          <div class="label">
-            标签
-          </div>
-          <div class="u-flex labelGroup">
-            <div>
-              <el-tag
-                v-for="(tag, index) in form.labelList"
-                :key="index"
-                closable
-                :disable-transitions="false"
-                class="mr-5 mb-5"
-                @close="handleClose(index)"
-              >
-                {{ tag.labelName }}
-              </el-tag>
-              <el-input
-                v-if="inputVisible"
-                ref="saveTagInput"
-                v-model="inputValue"
-                class="input-new-tag"
-                size="small"
-                @keyup.enter.native="handleInputConfirm"
-                @blur="handleInputConfirm"
-              />
-              <el-button v-else class="button-new-tag" size="small" @click="showInput">新增</el-button>
-            </div>
-          </div>
-        </div>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancelCU">取消</el-button>
-        <el-button
-          :loading="subloading"
-          type="primary"
-          @click="submitTlabel"
-        >确认</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import pagination from '@crud/Pagination'
-import udOperation from '@crud/UD.operation'
-import { labelOrganizeAdd, labelOrganizeDel, labelOrganizeUpdate } from '@/api/index'
-const defaultForm = {}
-export default {
-  name: 'LabelManagement',
-  components: {
-    rrOperation,
-    pagination,
-    udOperation,
-    crudOperation
-  },
-  cruds() {
-    return CRUD({
-      title: '标签管理',
-      url: 'api-management/api/labelOrganize/queryAll',
-      optShow: {
-        add: true,
-        edit: false,
-        del: true,
-        download: false,
-        reset: true
-      },
-      crudMethod: { del: labelOrganizeDel }
-    })
-  },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  data() {
-    return {
-      permission: {
-        add: ['admin', 'user:add'],
-        edit: ['admin', 'user:edit'],
-        del: ['admin', 'user:del'],
-        download: ['admin', 'user:download'],
-        recharge: false,
-        labelDel: true
-      },
-      inputVisible: false,
-      inputValue: '',
-      subloading: false,
-      labelDialog: false,
-      delArr: [], // 删除ID
-      form: {
-        name: '',
-        isEnable: 0,
-        labelList: []
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入标签组名', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  mounted() {
-
-  },
-  methods: {
-    submitTlabel() {
-      this.$refs.form.validate((valide) => {
-        if (valide) {
-          this.subloading = true
-          const obj = Object.assign({}, this.form)
-          // const arr = []
-          // obj.labelList.length > 0 && obj.labelList.forEach(element => {
-          //   arr.push({ labelName: element })
-          // })
-          // obj.labelList = arr
-          // delete obj.labelList
-          if (this.crud.status.add === 1) {
-            labelOrganizeAdd(obj).then(res => {
-              this.$message({
-                type: 'success',
-                message: '操作成功!',
-                showClose: true
-              })
-              this.subloading = false
-              this.cancelCU()
-              this.crud.toQuery()
-            }).catch(() => {
-              this.subloading = false
-            })
-          } else if (this.crud.status.edit === 1) {
-            obj.id = this.form.id
-            obj.delLabelId = this.delArr
-            labelOrganizeUpdate(obj).then(res => {
-              this.$message({
-                type: 'success',
-                message: '操作成功!',
-                showClose: true
-              })
-              this.subloading = false
-              this.cancelCU()
-              this.crud.toQuery()
-            }).catch(() => {
-              this.subloading = false
-            })
-          }
-          this.delArr = []
-          this.form = {
-            name: '',
-            isEnable: 0,
-            labelList: []
-          }
-        }
-      })
-    },
-    quickUpdate(data) {
-      labelOrganizeUpdate(data).then(res => {
-        this.crud.toQuery()
-      }).catch(() => {
-      })
-    },
-    editLabel(data) {
-      this.crud.status.edit = 1
-      this.crud.getDataStatus(this.crud.getDataId(data)).edit = 1
-      const todata = JSON.stringify(data)
-      this.form = JSON.parse(todata)
-    },
-    handleClose(index) {
-      if (this.form.labelList[index].id != null) this.delArr.push(this.form.labelList[index].id)
-      this.form.labelList.splice(index, 1)
-    },
-    showInput() {
-      this.inputVisible = true
-      this.$nextTick(_ => {
-        this.$refs.saveTagInput.$refs.input.focus()
-      })
-    },
-    cancelCU() {
-      if (this.crud.status.edit === 1) {
-        this.crud.status.edit = 0
-      }
-      if (this.crud.status.add === 1) {
-        this.crud.status.add = 0
-      }
-      this.form.name = ''
-      this.form.isEnable = 0
-      this.form.labelList = []
-      this.$refs['form'].clearValidate()
-    },
-    handleInputConfirm() {
-      const inputValue = this.inputValue
-      if (inputValue) {
-        this.form.labelList.push({ labelName: inputValue, id: null })
-      }
-      this.inputVisible = false
-      this.inputValue = ''
-    }
-  }
-}
-</script>
-<style lang="scss">
-.label{
-  min-width: 80px;
-  line-height: 32px;
-  float: none;
-  display: inline-block;
-  font-size: 14px;
-  color: #606266;
-  text-align: right;
-  vertical-align: middle;
-  font-weight: 700;
-  padding: 0 12px 0 20px;
-}
-.labelGroup {
-  flex-wrap: wrap;
-  div{
-    margin-right: 6px;
-  }
-}
-.input-new-tag {
-  width: 90px;
-  margin-left: 10px;
-  vertical-align: bottom;
-}
-.button-new-tag {
-  height: 32px;
-  line-height: 30px;
-  padding-top: 0;
-  padding-bottom: 0;
-}
-</style>
+<!--
+ * @Description: 标签管理
+ * @Autor: 飘泊客
+ * @Date: 2022-05-23 15:20:02
+ * @LastEditors: 飘泊客
+ * @LastEditTime: 2023-05-16 16:53:42
+-->
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div>
+        <!-- 搜索 -->
+        <label class="y-label">标签组名：</label>
+        <el-input
+          v-model="query.name"
+          clearable
+          size="small"
+          placeholder="请输入"
+          style="width: 170px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <rrOperation />
+      </div>
+      <crudOperation show="" :permission="permission" />
+    </div>
+    <!--表格渲染-->
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" :header-cell-style="{'text-align':'left'}" @selection-change="crud.selectionChangeHandler">
+      <el-table-column type="selection" width="55" />
+      <el-table-column :show-overflow-tooltip="true" prop="name" label="标签组名" />
+      <el-table-column :show-overflow-tooltip="true" prop="labelList" label="标签">
+        <template slot-scope="scope">
+          <div class="u-flex">
+            <div v-for="item in scope.row.labelList" :key="item.id" class="mr-5">
+              <el-tag>{{ item.labelName }}</el-tag>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" prop="isEnable" label="是否开启">
+        <template slot-scope="scope">
+          <el-switch v-model="scope.row.isEnable" active-color="#246fdc" :active-value="1" :inactive-value="0" @change="quickUpdate(scope.row)" />
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        width="100"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <udOperation
+            :data="scope.row"
+            :permission="permission"
+            @customEdit="editLabel"
+          />
+        </template>
+      </el-table-column>
+      <template #empty>
+        <div style="width: 100%; height: 450px;display: flex; flex-direction: column; justify-content: center;align-items: center">
+          <img src="@/assets/images/zanwu.png" alt="">
+          <div>暂无数据</div>
+        </div>
+      </template>
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <el-dialog
+      append-to-body
+      :close-on-click-modal="false"
+      :before-close="cancelCU"
+      :visible.sync="crud.status.cu > 0"
+      title="标签管理"
+      width="520px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :rules="rules"
+        :model="form"
+        size="small"
+        label-width="80px"
+      >
+        <el-form-item label="标签组名" prop="name">
+          <el-input v-model="form.name" style="width: 340px" />
+        </el-form-item>
+        <el-form-item label="是否开启">
+          <el-switch v-model="form.isEnable" active-color="#246fdc" :active-value="1" :inactive-value="0" />
+        </el-form-item>
+        <div class="u-flex mb-15">
+          <div class="label">
+            标签
+          </div>
+          <div class="u-flex labelGroup">
+            <div>
+              <el-tag
+                v-for="(tag, index) in form.labelList"
+                :key="index"
+                closable
+                :disable-transitions="false"
+                class="mr-5 mb-5"
+                @close="handleClose(index)"
+              >
+                {{ tag.labelName }}
+              </el-tag>
+              <el-input
+                v-if="inputVisible"
+                ref="saveTagInput"
+                v-model="inputValue"
+                class="input-new-tag"
+                size="small"
+                @keyup.enter.native="handleInputConfirm"
+                @blur="handleInputConfirm"
+              />
+              <el-button v-else class="button-new-tag" size="small" @click="showInput">新增</el-button>
+            </div>
+          </div>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancelCU">取消</el-button>
+        <el-button
+          :loading="subloading"
+          type="primary"
+          @click="submitTlabel"
+        >确认</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import udOperation from '@crud/UD.operation'
+import { labelOrganizeAdd, labelOrganizeDel, labelOrganizeUpdate } from '@/api/index'
+const defaultForm = {}
+export default {
+  name: 'LabelManagement',
+  components: {
+    rrOperation,
+    pagination,
+    udOperation,
+    crudOperation
+  },
+  cruds() {
+    return CRUD({
+      title: '标签管理',
+      url: 'api-management/api/labelOrganize/queryAll',
+      optShow: {
+        add: true,
+        edit: false,
+        del: true,
+        download: false,
+        reset: true
+      },
+      crudMethod: { del: labelOrganizeDel }
+    })
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      permission: {
+        add: ['admin', 'user:add'],
+        edit: ['admin', 'user:edit'],
+        del: ['admin', 'user:del'],
+        download: ['admin', 'user:download'],
+        recharge: false,
+        labelDel: true
+      },
+      inputVisible: false,
+      inputValue: '',
+      subloading: false,
+      labelDialog: false,
+      delArr: [], // 删除ID
+      form: {
+        name: '',
+        isEnable: 0,
+        labelList: []
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入标签组名', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    submitTlabel() {
+      this.$refs.form.validate((valide) => {
+        if (valide) {
+          this.subloading = true
+          const obj = Object.assign({}, this.form)
+          // const arr = []
+          // obj.labelList.length > 0 && obj.labelList.forEach(element => {
+          //   arr.push({ labelName: element })
+          // })
+          // obj.labelList = arr
+          // delete obj.labelList
+          if (this.crud.status.add === 1) {
+            labelOrganizeAdd(obj).then(res => {
+              this.$message({
+                type: 'success',
+                message: '操作成功!',
+                showClose: true
+              })
+              this.subloading = false
+              this.cancelCU()
+              this.crud.toQuery()
+            }).catch(() => {
+              this.subloading = false
+            })
+          } else if (this.crud.status.edit === 1) {
+            obj.id = this.form.id
+            obj.delLabelId = this.delArr
+            labelOrganizeUpdate(obj).then(res => {
+              this.$message({
+                type: 'success',
+                message: '操作成功!',
+                showClose: true
+              })
+              this.subloading = false
+              this.cancelCU()
+              this.crud.toQuery()
+            }).catch(() => {
+              this.subloading = false
+            })
+          }
+          this.delArr = []
+          this.form = {
+            name: '',
+            isEnable: 0,
+            labelList: []
+          }
+        }
+      })
+    },
+    quickUpdate(data) {
+      labelOrganizeUpdate(data).then(res => {
+        this.crud.toQuery()
+      }).catch(() => {
+      })
+    },
+    editLabel(data) {
+      this.crud.status.edit = 1
+      this.crud.getDataStatus(this.crud.getDataId(data)).edit = 1
+      const todata = JSON.stringify(data)
+      this.form = JSON.parse(todata)
+    },
+    handleClose(index) {
+      if (this.form.labelList[index].id != null) this.delArr.push(this.form.labelList[index].id)
+      this.form.labelList.splice(index, 1)
+    },
+    showInput() {
+      this.inputVisible = true
+      this.$nextTick(_ => {
+        this.$refs.saveTagInput.$refs.input.focus()
+      })
+    },
+    cancelCU() {
+      if (this.crud.status.edit === 1) {
+        this.crud.status.edit = 0
+      }
+      if (this.crud.status.add === 1) {
+        this.crud.status.add = 0
+      }
+      this.form.name = ''
+      this.form.isEnable = 0
+      this.form.labelList = []
+      this.$refs['form'].clearValidate()
+    },
+    handleInputConfirm() {
+      const inputValue = this.inputValue
+      if (inputValue) {
+        this.form.labelList.push({ labelName: inputValue, id: null })
+      }
+      this.inputVisible = false
+      this.inputValue = ''
+    }
+  }
+}
+</script>
+<style lang="scss">
+.label{
+  min-width: 80px;
+  line-height: 32px;
+  float: none;
+  display: inline-block;
+  font-size: 14px;
+  color: #606266;
+  text-align: right;
+  vertical-align: middle;
+  font-weight: 700;
+  padding: 0 12px 0 20px;
+}
+.labelGroup {
+  flex-wrap: wrap;
+  div{
+    margin-right: 6px;
+  }
+}
+.input-new-tag {
+  width: 90px;
+  margin-left: 10px;
+  vertical-align: bottom;
+}
+.button-new-tag {
+  height: 32px;
+  line-height: 30px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+</style>
diff --git a/src/views/nested/account/index.vue b/src/views/nested/account/index.vue
index becb64a..07c3d86 100644
--- a/src/views/nested/account/index.vue
+++ b/src/views/nested/account/index.vue
@@ -1,557 +1,557 @@
-<template>
-  <div class="app-container">
-    <el-row :s="20">
-      <!--用户数据-->
-      <el-col :xs="15" :sm="18" :md="19" :lg="20" :xl="20">
-        <!--工具栏-->
-        <div class="head-container">
-          <div>
-            <!-- 搜索 -->
-            <el-input
-              v-model="query.nickName"
-              clearable
-              size="small"
-              placeholder="输入昵称"
-              style="width: 200px;"
-              class="filter-item"
-              @keyup.enter.native="crud.toQuery"
-            />
-            <rrOperation />
-          </div>
-          <!-- 按钮组 -->
-          <!-- <crudOperation show="" :permission="permission" /> -->
-        </div>
-        <!--表单渲染-->
-        <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="ChildrenAccountPop" title="子账号列表" width="850px">
-          <!-- <el-form ref="form" :inline="true" :model="form" size="small" label-width="66px">
-            <el-input
-              v-model="query.blurry"
-              clearable
-              size="small"
-              placeholder="输入主账号昵称"
-              style="width: 200px;"
-              class="filter-item"
-              @keyup.enter.native="crud.toQuery"
-            />
-            <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="crud.toQuery">搜索</el-button>
-          </el-form> -->
-          <el-table ref="table" v-loading="crud.loading" :data="ChildrenAccountList" :header-cell-style="{'text-align':'left'}" style="width: 100%;">
-            <el-table-column :show-overflow-tooltip="true" prop="nickname" label="子账号昵称" width="190px" />
-            <!-- <el-table-column :show-overflow-tooltip="true" prop="shopTitle" label="店铺名称" /> -->
-            <el-table-column :show-overflow-tooltip="true" prop="authorizeStartTime" label="授权时间" width="150px">
-              <template slot-scope="scope">
-                {{ parseTime(scope.row.authorizeStartTime) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="authorizeDay" label="授权时长" />
-            <el-table-column prop="authorizeEndTime" label="授权结束时间" width="150px">
-              <template slot-scope="scope">
-                {{ parseTime(scope.row.authorizeEndTime) }}
-              </template>
-            </el-table-column>
-            <el-table-column :show-overflow-tooltip="true" prop="status" label="状态">
-              <template slot-scope="scope">
-                <el-tag v-if="scope.row.status === 1" type="success">已开启</el-tag>
-                <el-tag v-else-if="scope.row.status === 2" type="info">过期</el-tag>
-                <el-tag v-else-if="scope.row.status === 0" type="warning">未开启</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="操作"
-              width="120"
-              fixed="right"
-            >
-              <template slot-scope="scope">
-                <el-button
-                  class="filter-item"
-                  size="mini"
-                  type="primary"
-                  @click="authorizationOper(scope.row)"
-                >
-                  {{ scope.row.status === 1 ? "续期" : "授权" }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-          <div slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="ChildrenAccountPop = false">关闭</el-button>
-          </div>
-        </el-dialog>
-        <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="PackageDia" title="套餐订购" width="570px">
-          <div class="row-title flex-around">
-            <div class="flex1">套餐</div>
-            <div class="flex1">价格</div>
-            <div class="flex1">时长</div>
-            <div class="flex1">操作</div>
-          </div>
-          <div v-for="(item, index) in PackageList" :key="index" class="row-conent flex-around">
-            <div class="flex1"><el-tag>{{ item.packageName }}</el-tag></div>
-            <div class="flex1">{{ item.amount }}￥</div>
-            <div class="flex1">{{ item.packageDay }}天</div>
-            <div class="flex1">
-              <el-button class="filter-item" size="mini" type="primary" @click="pcPay(item)">授权</el-button>
-            </div>
-          </div>
-        </el-dialog>
-        <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="historicalOrder" title="历史订单同步" width="620px">
-          <div class="margin-bot flex-cen">
-            <div>
-              <el-date-picker
-                v-model="selectdate"
-                type="daterange"
-                format:="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
-                range-separator=":"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                :picker-options="pickerOptions"
-              />
-            </div>
-            <div class="pl-5">
-              <el-button class="filter-item" size="mini" type="primary" :disabled="!selectdate" @click="selseHist">查询</el-button>
-            </div>
-          </div>
-          <div v-if="anticipate" class="row-title flex-around">
-            <div class="flex1">订单预付金额</div>
-            <div class="flex1">订单同步历史金额</div>
-            <div class="flex1">预付款可用数量</div>
-            <div class="flex1">操作</div>
-          </div>
-          <div v-if="anticipate" class="row-conent flex-around">
-            <div class="flex1"><el-tag>{{ anticipate.amount || 0 }}￥</el-tag></div>
-            <div class="flex1"><el-tag type="info">{{ anticipate.identicalAmount || 0 }}￥</el-tag></div>
-            <div class="flex1">{{ anticipate.anticipateNum || 0 }}</div>
-            <div class="flex1">
-              <el-button v-if="Math.trunc(anticipate.amount) !== 0" class="filter-item" size="mini" type="primary" @click="pcOrderPay()">授权</el-button>
-              <el-button v-else class="filter-item" size="mini" type="primary" @click="customProp({type: 'custom'})">自定义</el-button>
-              <el-button class="filter-item" size="mini" type="warning" @click="customProp({type: 'free'})">免费</el-button>
-            </div>
-          </div>
-        </el-dialog>
-        <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="historicalPay" title="历史支付记录" width="800px">
-          <div v-if="payList.length > 0">
-            <div class="row-title flex-around">
-              <div class="flex1">历史同步开始日期</div>
-              <div class="flex1">历史同步结束日期</div>
-              <div class="flex1">总支付金额</div>
-              <div class="flex1">同步条数</div>
-              <div class="flex1">支付时间</div>
-              <div class="flex1">状态</div>
-            </div>
-            <div v-for="item in payList" :key="item.id" class="row-conent flex-around">
-              <div class="flex1">{{ item.orderStartTime }}</div>
-              <div class="flex1">{{ item.orderEndTime }}</div>
-              <div class="flex1"><el-tag>{{ item.amount || 0 }}￥</el-tag></div>
-              <div class="flex1">{{ item.anticipateNum || 0 }}</div>
-              <div class="flex1">{{ item.payTime }}</div>
-              <div class="flex1">
-                <el-tag v-if="item.status === 1" type="success">已支付</el-tag>
-                <el-tag v-else-if="item.status === 2" type="danger">支付失败</el-tag>
-                <el-tag v-else-if="item.status === 0 && item.payType !== 0" type="warning">未支付</el-tag>
-                <el-tag v-else-if="item.payType === 0">免费开通</el-tag>
-              </div>
-            </div>
-          </div>
-          <div v-else>
-            <p>暂无历史记录</p>
-          </div>
-        </el-dialog>
-        <!--表格渲染-->
-        <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" :header-cell-style="{'text-align':'left'}" @selection-change="crud.selectionChangeHandler">
-          <el-table-column type="selection" width="55" />
-          <el-table-column :show-overflow-tooltip="true" prop="nickname" label="用户昵称" />
-          <el-table-column :show-overflow-tooltip="true" prop="shopTitle" label="店铺名称" />
-          <el-table-column :show-overflow-tooltip="true" prop="accountBalance" label="账户余额" />
-          <el-table-column :show-overflow-tooltip="true" prop="massNum" label="消息总条数" />
-          <el-table-column label="消息剩余数量" align="center">
-            <template slot-scope="scope">
-              {{ Number(scope.row.massNum) - Number(scope.row.messageCount) }}
-            </template>
-          </el-table-column>
-          <!-- <el-table-column prop="status" label="状态" align="center">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.status"
-                active-color="#409EFF"
-                inactive-color="#F56C6C"
-                disabled
-              />
-            </template>
-          </el-table-column> -->
-          <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
-            <template slot-scope="scope">
-              {{ parseTime(scope.row.createTime) }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            width="250"
-            fixed="right"
-          >
-            <template slot-scope="scope">
-              <!-- <div class="flex-around"> -->
-              <el-button
-                class="filter-item"
-                size="mini"
-                type="primary"
-                @click="toGrantList(scope.row)"
-              >
-                查看
-              </el-button>
-              <el-button
-                class="filter-item"
-                size="mini"
-                type="warning"
-                @click="addFlowPacket(scope.row)"
-              >
-                同步
-              </el-button>
-              <el-button
-                class="filter-item"
-                size="mini"
-                type="success"
-                @click="selectPayList(scope.row)"
-              >
-                支付记录
-              </el-button>
-              <!-- <el-button
-                class="filter-item"
-                size="mini"
-                type="success"
-                @click="updataAcc(scope.row)"
-              >
-                修改
-              </el-button> -->
-              <!-- </div> -->
-            </template>
-          </el-table-column>
-        </el-table>
-        <!--分页组件-->
-        <pagination />
-      </el-col>
-    </el-row>
-  </div>
-</template>
-<script>
-import crudUser from '@/api/index'
-import { subAccount, getTemplate, pcPay, saleSize, synchronizationOrder, orderSnList, freeSync } from '@/api/index'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import { parseTime } from '@/utils/index'
-// import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-let userRoles = []
-const defaultForm = { id: null, nickName: null }
-export default {
-  name: 'Account',
-  components: { crudOperation, rrOperation, pagination },
-  cruds() {
-    return CRUD({ title: '账号', url: 'api/parent/accounts', crudMethod: { ...crudUser }, query: { 'sellerNick': '' }})
-  },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  // 数据字典
-  data() {
-    // 自定义验证
-    return {
-      height: document.documentElement.clientHeight - 180 + 'px;',
-      depts: [],
-      defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
-      permission: {
-        add: ['admin', false],
-        edit: ['admin', 'ChildrenUser:edit'],
-        del: ['admin', 'ChildrenUser:del'],
-        download: ['admin', false]
-      },
-      enabledTypeOptions: [
-        { key: 'true', display_name: '激活' },
-        { key: 'false', display_name: '锁定' }
-      ],
-      PackageDia: false, // 套餐弹框
-      historicalOrder: false, // 历史订单
-      historicalPay: false, // 历史订单弹框
-      payList: [], // 历史支付记录
-      ChildrenAccountPop: false,
-      ChildrenAccountList: [],
-      PackageList: [], // 套餐列表,
-      childrenNickname: '', // 子账号昵称
-      selectdate: '',
-      sessionKey: '', // 主账号sessionkey
-      parentNickname: '', // 主账号昵称
-      parentid: '', // 主账号id
-      anticipate: '', // 预付对象
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近二个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 60)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      }
-    }
-  },
-  created() {
-  },
-  mounted: function() {
-    const that = this
-    window.onresize = function temp() {
-      that.height = document.documentElement.clientHeight - 180 + 'px;'
-    }
-    this.getTemplate()
-  },
-  methods: {
-    changeRole(value) {
-      userRoles = []
-      value.forEach(function(data, index) {
-        const role = { id: data }
-        userRoles.push(role)
-      })
-    },
-    deleteTag(value) {
-      userRoles.forEach(function(data, index) {
-        if (data.id === value) {
-          userRoles.splice(index, value)
-        }
-      })
-    },
-    // 授权子账号
-    authorizationOper(data) {
-      this.childrenNickname = data.nickname
-      this.PackageDia = true
-    },
-    // 获取授权子账号列表
-    toGrantList(option) {
-      subAccount(option.id).then(res => {
-        const data = res.data
-        if (data.code === 200) {
-          this.ChildrenAccountList = JSON.parse(data.data).data
-          this.ChildrenAccountPop = true
-          this.parentid = option.id
-          this.sessionKey = option.sessionKey
-          this.parentNickname = option.nickname
-        } else {
-          this.$message.error(data.message)
-        }
-      })
-    },
-    // 查看历史支付记录
-    selectPayList(option) {
-      orderSnList(option.nickname).then(res => {
-        const data = res.data
-        if (data.code === 200) {
-          this.payList = data.data
-          this.historicalPay = true
-        }
-      })
-    },
-    // 流量包
-    addFlowPacket(option) {
-      this.historicalOrder = true
-      this.parentid = option.id
-      this.sessionKey = option.sessionKey
-      this.parentNickname = option.nickname
-      console.log(this.parentid)
-      console.log(this.sessionKey)
-      console.log(this.parentNickname)
-      this.anticipate = ''
-      this.selectdate = '' // 清空日期框
-    },
-    // 历史订单同步
-    selseHist() {
-      saleSize({
-        nickname: this.parentNickname,
-        sessionKey: this.sessionKey,
-        startTime: this.selectdate[0],
-        endTime: this.selectdate[1],
-        parentId: this.parentid
-      }).then(res => {
-        const data = res.data
-        if (data.code === 200) {
-          this.anticipate = data.data
-        } else {
-          this.$message.error(data.message)
-        }
-      }).catch(() => {
-        this.$message.error('系统异常，请重试')
-      })
-    },
-    // 自定义价格
-    customProp(optins) {
-      const { type } = optins
-      this.$prompt('请输入预存款', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputPattern: /^[0-9]*$/,
-        inputErrorMessage: '必须是数字'
-      }).then(({ value }) => {
-        if (type === 'custom') {
-          this.pcOrderPay(value)
-        } else if (type === 'free') {
-          this.freeSync(value)
-        }
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消输入'
-        })
-      })
-    },
-    // 同步订单支付
-    pcOrderPay(amount = 0) {
-      if (amount !== 0) {
-        this.anticipate.amount = amount
-      }
-      synchronizationOrder(this.anticipate).then(res => {
-        const data = res.data
-        if (data.code === 200) {
-          const div = document.createElement('div')
-          div.innerHTML = data.data
-          div.id = 'orderPay'
-          document.body.appendChild(div)
-          document.forms[0].target = '_blank'
-          document.forms[0].submit()
-          document.body.removeChild(document.getElementById('orderPay'))
-          this.$confirm('请确定充值是否完成', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.historicalOrder = false
-            this.ChildrenAccountPop = false
-            this.crud.toQuery()
-          }).catch(() => {
-            data.enabled = !data.enabled
-          })
-        }
-      })
-    },
-    // 免费同步
-    freeSync(amount) {
-      this.anticipate.amount = amount
-      freeSync(this.anticipate).then(res => {
-        const data = res.data
-        if (data.code === 200) {
-          this.$message({
-            type: 'success',
-            message: data.message
-          })
-          this.$confirm('请确定充值是否完成', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.historicalOrder = false
-            this.ChildrenAccountPop = false
-            this.crud.toQuery()
-          }).catch(() => {
-            data.enabled = !data.enabled
-          })
-        }
-      })
-    },
-    // 授权
-    pcPay(data) {
-      pcPay({ amount: data.amount, templateId: data.templateId, payType: 1, nickName: this.childrenNickname, masterAccountId: this.parentid }).then(res => {
-        const data = res.data
-        if (data.code === 200) {
-          const div = document.createElement('div')
-          div.innerHTML = data.data
-          div.id = 'pay'
-          document.body.appendChild(div)
-          document.forms[0].target = '_blank'
-          document.forms[0].submit()
-          document.body.removeChild(document.getElementById('pay'))
-          this.$confirm('请确定充值是否完成', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.PackageDia = false
-            this.ChildrenAccountPop = false
-            this.crud.toQuery()
-          }).catch(() => {
-            data.enabled = !data.enabled
-          })
-        }
-      })
-    },
-    // 改变状态
-    changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        crudUser.edit(data).then(res => {
-          this.crud.notify(this.dict.label.user_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          data.enabled = !data.enabled
-        })
-      }).catch(() => {
-        data.enabled = !data.enabled
-      })
-    },
-    // 套餐列表
-    getTemplate() {
-      getTemplate().then(res => {
-        const data = res.data
-        if (data.code === 200) {
-          this.PackageList = JSON.parse(data.data).data
-        }
-      }).catch(() => {})
-    },
-    checkboxT(row, rowIndex) {
-      return row.id !== this.user.id
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
-    height: 30px;
-    line-height: 30px;
-  }
-  .flex-around{
-    display: flex;
-    justify-content: space-around;
-  }
-  .row-conent{
-    margin-top: 10px;
-  }
-  .margin-bot{
-    margin-bottom: 10px;
-  }
- .flex1{
-   flex: 1;
-   text-align: center;
- }
-.flex-cen{
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-}
-.line{
-  padding: 0 6px;
-}
-</style>
+<template>
+  <div class="app-container">
+    <el-row :s="20">
+      <!--用户数据-->
+      <el-col :xs="15" :sm="18" :md="19" :lg="20" :xl="20">
+        <!--工具栏-->
+        <div class="head-container">
+          <div>
+            <!-- 搜索 -->
+            <el-input
+              v-model="query.nickName"
+              clearable
+              size="small"
+              placeholder="输入昵称"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+            <rrOperation />
+          </div>
+          <!-- 按钮组 -->
+          <!-- <crudOperation show="" :permission="permission" /> -->
+        </div>
+        <!--表单渲染-->
+        <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="ChildrenAccountPop" title="子账号列表" width="850px">
+          <!-- <el-form ref="form" :inline="true" :model="form" size="small" label-width="66px">
+            <el-input
+              v-model="query.blurry"
+              clearable
+              size="small"
+              placeholder="输入主账号昵称"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+            <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="crud.toQuery">搜索</el-button>
+          </el-form> -->
+          <el-table ref="table" v-loading="crud.loading" :data="ChildrenAccountList" :header-cell-style="{'text-align':'left'}" style="width: 100%;">
+            <el-table-column :show-overflow-tooltip="true" prop="nickname" label="子账号昵称" width="190px" />
+            <!-- <el-table-column :show-overflow-tooltip="true" prop="shopTitle" label="店铺名称" /> -->
+            <el-table-column :show-overflow-tooltip="true" prop="authorizeStartTime" label="授权时间" width="150px">
+              <template slot-scope="scope">
+                {{ parseTime(scope.row.authorizeStartTime) }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="authorizeDay" label="授权时长" />
+            <el-table-column prop="authorizeEndTime" label="授权结束时间" width="150px">
+              <template slot-scope="scope">
+                {{ parseTime(scope.row.authorizeEndTime) }}
+              </template>
+            </el-table-column>
+            <el-table-column :show-overflow-tooltip="true" prop="status" label="状态">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.status === 1" type="success">已开启</el-tag>
+                <el-tag v-else-if="scope.row.status === 2" type="info">过期</el-tag>
+                <el-tag v-else-if="scope.row.status === 0" type="warning">未开启</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              width="75"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  class="filter-item"
+                  size="mini"
+                  type="primary"
+                  @click="authorizationOper(scope.row)"
+                >
+                  {{ scope.row.status === 1 ? "续期" : "授权" }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="ChildrenAccountPop = false">关闭</el-button>
+          </div>
+        </el-dialog>
+        <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="PackageDia" title="套餐订购" width="570px">
+          <div class="row-title flex-around">
+            <div class="flex1">套餐</div>
+            <div class="flex1">价格</div>
+            <div class="flex1">时长</div>
+            <div class="flex1">操作</div>
+          </div>
+          <div v-for="(item, index) in PackageList" :key="index" class="row-conent flex-around">
+            <div class="flex1"><el-tag>{{ item.packageName }}</el-tag></div>
+            <div class="flex1">{{ item.amount }}￥</div>
+            <div class="flex1">{{ item.packageDay }}天</div>
+            <div class="flex1">
+              <el-button class="filter-item" size="mini" type="primary" @click="pcPay(item)">授权</el-button>
+            </div>
+          </div>
+        </el-dialog>
+        <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="historicalOrder" title="历史订单同步" width="620px">
+          <div class="margin-bot flex-cen">
+            <div>
+              <el-date-picker
+                v-model="selectdate"
+                type="daterange"
+                format:="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                range-separator=":"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :picker-options="pickerOptions"
+              />
+            </div>
+            <div class="pl-5">
+              <el-button class="filter-item" size="mini" type="primary" :disabled="!selectdate" @click="selseHist">查询</el-button>
+            </div>
+          </div>
+          <div v-if="anticipate" class="row-title flex-around">
+            <div class="flex1">订单预付金额</div>
+            <div class="flex1">订单同步历史金额</div>
+            <div class="flex1">预付款可用数量</div>
+            <div class="flex1">操作</div>
+          </div>
+          <div v-if="anticipate" class="row-conent flex-around">
+            <div class="flex1"><el-tag>{{ anticipate.amount || 0 }}￥</el-tag></div>
+            <div class="flex1"><el-tag type="info">{{ anticipate.identicalAmount || 0 }}￥</el-tag></div>
+            <div class="flex1">{{ anticipate.anticipateNum || 0 }}</div>
+            <div class="flex1">
+              <el-button v-if="Math.trunc(anticipate.amount) !== 0" class="filter-item" size="mini" type="primary" @click="pcOrderPay()">授权</el-button>
+              <el-button v-else class="filter-item" size="mini" type="primary" @click="customProp({type: 'custom'})">自定义</el-button>
+              <el-button class="filter-item" size="mini" type="warning" @click="customProp({type: 'free'})">免费</el-button>
+            </div>
+          </div>
+        </el-dialog>
+        <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="historicalPay" title="历史支付记录" width="800px">
+          <div v-if="payList.length > 0">
+            <div class="row-title flex-around">
+              <div class="flex1">历史同步开始日期</div>
+              <div class="flex1">历史同步结束日期</div>
+              <div class="flex1">总支付金额</div>
+              <div class="flex1">同步条数</div>
+              <div class="flex1">支付时间</div>
+              <div class="flex1">状态</div>
+            </div>
+            <div v-for="item in payList" :key="item.id" class="row-conent flex-around">
+              <div class="flex1">{{ item.orderStartTime }}</div>
+              <div class="flex1">{{ item.orderEndTime }}</div>
+              <div class="flex1"><el-tag>{{ item.amount || 0 }}￥</el-tag></div>
+              <div class="flex1">{{ item.anticipateNum || 0 }}</div>
+              <div class="flex1">{{ item.payTime }}</div>
+              <div class="flex1">
+                <el-tag v-if="item.status === 1" type="success">已支付</el-tag>
+                <el-tag v-else-if="item.status === 2" type="danger">支付失败</el-tag>
+                <el-tag v-else-if="item.status === 0 && item.payType !== 0" type="warning">未支付</el-tag>
+                <el-tag v-else-if="item.payType === 0">免费开通</el-tag>
+              </div>
+            </div>
+          </div>
+          <div v-else>
+            <p>暂无历史记录</p>
+          </div>
+        </el-dialog>
+        <!--表格渲染-->
+        <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" :header-cell-style="{'text-align':'left'}" @selection-change="crud.selectionChangeHandler">
+          <el-table-column type="selection" width="55" />
+          <el-table-column :show-overflow-tooltip="true" prop="nickname" label="用户昵称" />
+          <el-table-column :show-overflow-tooltip="true" prop="shopTitle" label="店铺名称" />
+          <el-table-column :show-overflow-tooltip="true" prop="accountBalance" label="账户余额" />
+          <el-table-column :show-overflow-tooltip="true" prop="massNum" label="消息总条数" />
+          <el-table-column label="消息剩余数量" align="center">
+            <template slot-scope="scope">
+              {{ Number(scope.row.massNum) - Number(scope.row.messageCount) }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column prop="status" label="状态" align="center">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.status"
+                active-color="#409EFF"
+                inactive-color="#F56C6C"
+                disabled
+              />
+            </template>
+          </el-table-column> -->
+          <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
+            <template slot-scope="scope">
+              {{ parseTime(scope.row.createTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            width="160"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <!-- <div class="flex-around"> -->
+              <el-button
+                class="filter-item"
+                size="mini"
+                type="primary"
+                @click="toGrantList(scope.row)"
+              >
+                查看
+              </el-button>
+              <el-button
+                class="filter-item"
+                size="mini"
+                type="warning"
+                @click="addFlowPacket(scope.row)"
+              >
+                同步
+              </el-button>
+              <el-button
+                class="filter-item"
+                size="mini"
+                type="success"
+                @click="selectPayList(scope.row)"
+              >
+                支付记录
+              </el-button>
+              <!-- <el-button
+                class="filter-item"
+                size="mini"
+                type="success"
+                @click="updataAcc(scope.row)"
+              >
+                修改
+              </el-button> -->
+              <!-- </div> -->
+            </template>
+          </el-table-column>
+        </el-table>
+        <!--分页组件-->
+        <pagination />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import crudUser from '@/api/index'
+import { subAccount, getTemplate, pcPay, saleSize, synchronizationOrder, orderSnList, freeSync } from '@/api/index'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import { parseTime } from '@/utils/index'
+// import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+let userRoles = []
+const defaultForm = { id: null, nickName: null }
+export default {
+  name: 'Account',
+  components: { crudOperation, rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '账号', url: 'api/parent/accounts', crudMethod: { ...crudUser }, query: { 'sellerNick': '' }})
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  // 数据字典
+  data() {
+    // 自定义验证
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      depts: [],
+      defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
+      permission: {
+        add: ['admin', false],
+        edit: ['admin', 'ChildrenUser:edit'],
+        del: ['admin', 'ChildrenUser:del'],
+        download: ['admin', false]
+      },
+      enabledTypeOptions: [
+        { key: 'true', display_name: '激活' },
+        { key: 'false', display_name: '锁定' }
+      ],
+      PackageDia: false, // 套餐弹框
+      historicalOrder: false, // 历史订单
+      historicalPay: false, // 历史订单弹框
+      payList: [], // 历史支付记录
+      ChildrenAccountPop: false,
+      ChildrenAccountList: [],
+      PackageList: [], // 套餐列表,
+      childrenNickname: '', // 子账号昵称
+      selectdate: '',
+      sessionKey: '', // 主账号sessionkey
+      parentNickname: '', // 主账号昵称
+      parentid: '', // 主账号id
+      anticipate: '', // 预付对象
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近二个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 60)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }
+    }
+  },
+  created() {
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+    this.getTemplate()
+  },
+  methods: {
+    changeRole(value) {
+      userRoles = []
+      value.forEach(function(data, index) {
+        const role = { id: data }
+        userRoles.push(role)
+      })
+    },
+    deleteTag(value) {
+      userRoles.forEach(function(data, index) {
+        if (data.id === value) {
+          userRoles.splice(index, value)
+        }
+      })
+    },
+    // 授权子账号
+    authorizationOper(data) {
+      this.childrenNickname = data.nickname
+      this.PackageDia = true
+    },
+    // 获取授权子账号列表
+    toGrantList(option) {
+      subAccount(option.id).then(res => {
+        const data = res.data
+        if (data.code === 200) {
+          this.ChildrenAccountList = JSON.parse(data.data).data
+          this.ChildrenAccountPop = true
+          this.parentid = option.id
+          this.sessionKey = option.sessionKey
+          this.parentNickname = option.nickname
+        } else {
+          this.$message.error(data.message)
+        }
+      })
+    },
+    // 查看历史支付记录
+    selectPayList(option) {
+      orderSnList(option.nickname).then(res => {
+        const data = res.data
+        if (data.code === 200) {
+          this.payList = data.data
+          this.historicalPay = true
+        }
+      })
+    },
+    // 流量包
+    addFlowPacket(option) {
+      this.historicalOrder = true
+      this.parentid = option.id
+      this.sessionKey = option.sessionKey
+      this.parentNickname = option.nickname
+      console.log(this.parentid)
+      console.log(this.sessionKey)
+      console.log(this.parentNickname)
+      this.anticipate = ''
+      this.selectdate = '' // 清空日期框
+    },
+    // 历史订单同步
+    selseHist() {
+      saleSize({
+        nickname: this.parentNickname,
+        sessionKey: this.sessionKey,
+        startTime: this.selectdate[0],
+        endTime: this.selectdate[1],
+        parentId: this.parentid
+      }).then(res => {
+        const data = res.data
+        if (data.code === 200) {
+          this.anticipate = data.data
+        } else {
+          this.$message.error(data.message)
+        }
+      }).catch(() => {
+        this.$message.error('系统异常，请重试')
+      })
+    },
+    // 自定义价格
+    customProp(optins) {
+      const { type } = optins
+      this.$prompt('请输入预存款', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPattern: /^[0-9]*$/,
+        inputErrorMessage: '必须是数字'
+      }).then(({ value }) => {
+        if (type === 'custom') {
+          this.pcOrderPay(value)
+        } else if (type === 'free') {
+          this.freeSync(value)
+        }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消输入'
+        })
+      })
+    },
+    // 同步订单支付
+    pcOrderPay(amount = 0) {
+      if (amount !== 0) {
+        this.anticipate.amount = amount
+      }
+      synchronizationOrder(this.anticipate).then(res => {
+        const data = res.data
+        if (data.code === 200) {
+          const div = document.createElement('div')
+          div.innerHTML = data.data
+          div.id = 'orderPay'
+          document.body.appendChild(div)
+          document.forms[0].target = '_blank'
+          document.forms[0].submit()
+          document.body.removeChild(document.getElementById('orderPay'))
+          this.$confirm('请确定充值是否完成', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.historicalOrder = false
+            this.ChildrenAccountPop = false
+            this.crud.toQuery()
+          }).catch(() => {
+            data.enabled = !data.enabled
+          })
+        }
+      })
+    },
+    // 免费同步
+    freeSync(amount) {
+      this.anticipate.amount = amount
+      freeSync(this.anticipate).then(res => {
+        const data = res.data
+        if (data.code === 200) {
+          this.$message({
+            type: 'success',
+            message: data.message
+          })
+          this.$confirm('请确定充值是否完成', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.historicalOrder = false
+            this.ChildrenAccountPop = false
+            this.crud.toQuery()
+          }).catch(() => {
+            data.enabled = !data.enabled
+          })
+        }
+      })
+    },
+    // 授权
+    pcPay(data) {
+      pcPay({ amount: data.amount, templateId: data.templateId, payType: 1, nickName: this.childrenNickname, masterAccountId: this.parentid }).then(res => {
+        const data = res.data
+        if (data.code === 200) {
+          const div = document.createElement('div')
+          div.innerHTML = data.data
+          div.id = 'pay'
+          document.body.appendChild(div)
+          document.forms[0].target = '_blank'
+          document.forms[0].submit()
+          document.body.removeChild(document.getElementById('pay'))
+          this.$confirm('请确定充值是否完成', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.PackageDia = false
+            this.ChildrenAccountPop = false
+            this.crud.toQuery()
+          }).catch(() => {
+            data.enabled = !data.enabled
+          })
+        }
+      })
+    },
+    // 改变状态
+    changeEnabled(data, val) {
+      this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        crudUser.edit(data).then(res => {
+          this.crud.notify(this.dict.label.user_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        }).catch(() => {
+          data.enabled = !data.enabled
+        })
+      }).catch(() => {
+        data.enabled = !data.enabled
+      })
+    },
+    // 套餐列表
+    getTemplate() {
+      getTemplate().then(res => {
+        const data = res.data
+        if (data.code === 200) {
+          this.PackageList = JSON.parse(data.data).data
+        }
+      }).catch(() => {})
+    },
+    checkboxT(row, rowIndex) {
+      return row.id !== this.user.id
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
+    height: 30px;
+    line-height: 30px;
+  }
+  .flex-around{
+    display: flex;
+    justify-content: space-around;
+  }
+  .row-conent{
+    margin-top: 10px;
+  }
+  .margin-bot{
+    margin-bottom: 10px;
+  }
+ .flex1{
+   flex: 1;
+   text-align: center;
+ }
+.flex-cen{
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+.line{
+  padding: 0 6px;
+}
+</style>
diff --git a/src/views/packageManagement/index.vue b/src/views/packageManagement/index.vue
index d03bcb6..326f17d 100644
--- a/src/views/packageManagement/index.vue
+++ b/src/views/packageManagement/index.vue
@@ -1,664 +1,664 @@
-<!--
- * @Description: 套餐管理
- * @Autor: 飘泊客
- * @Date: 2022-06-14 15:20:02
- * @LastEditors: 飘泊客
- * @LastEditTime: 2023-02-02 13:56:28
--->
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div>
-        <!-- 搜索 -->
-        <el-input
-          v-model="query.name"
-          clearable
-          size="small"
-          placeholder="输入行业模板名"
-          style="width: 200px;"
-          class="filter-item"
-        />
-        <rrOperation />
-      </div>
-      <div>
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="templateProp = true"
-        >
-          新增模板
-        </el-button>
-        <el-tabs v-model="searchactiveName" @tab-click="handleTabClick">
-          <el-tab-pane label="模板管理" name="template" />
-          <el-tab-pane label="公司列表" name="companyArr" />
-        </el-tabs>
-      </div>
-    </div>
-    <!--表格渲染-->
-    <div v-show="searchactiveName == 'template'">
-      <el-table
-        ref="multipleTable"
-        v-loading="crud.loading"
-        :data="crud.data"
-        :header-cell-style="{'text-align':'left'}"
-        style="width: 100%"
-      >
-        <el-table-column
-          type="expand"
-        >
-          <template slot-scope="props">
-            <el-table
-              ref="childrenTable"
-              :data="props.row.payComboList"
-              :header-cell-style="{'text-align':'left'}"
-            >
-              <el-table-column width="50" />
-              <el-table-column :show-overflow-tooltip="true" prop="packageName" width="150" label="套餐名" />
-              <el-table-column :show-overflow-tooltip="true" prop="baseAmount" label="系统费" />
-              <el-table-column :show-overflow-tooltip="true" prop="amount" label="套餐费" />
-              <el-table-column :show-overflow-tooltip="true" prop="callDuration" label="套餐通话时长(分)" />
-              <el-table-column :show-overflow-tooltip="true" prop="packageDay" label="套餐时长(天)" />
-              <el-table-column :show-overflow-tooltip="true" prop="weChatFlag" label="企微添加权限">
-                <template slot-scope="scope">
-                  {{ scope.row.weChatFlag ? '已开通': '未开通' }}
-                </template>
-              </el-table-column>
-              <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
-                <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="模板名"
-        >
-          <template slot-scope="scope">{{ scope.row.name }}</template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" label="投流费用" prop="dmpDeliveryFee" />
-        <el-table-column
-          label="溢出双呼费用/分"
-        >
-          <template slot-scope="scope">{{ scope.row.doubleCallFee }}</template>
-        </el-table-column>
-        <el-table-column
-          label="溢出单呼费用/分"
-        >
-          <template slot-scope="scope">{{ scope.row.rollCallFee }}</template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作"
-          width="200"
-        >
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              class="ml-0"
-              icon="el-icon-edit"
-              @click="handleClick({ type: 'add', data: scope.row})"
-            />
-            <!-- <el-popover
-              :ref="`close-popover-${scope.$index}`"
-              placement="right"
-              width="400"
-              trigger="click"
-            >
-              <div>
-                <div class="el-dialog__title fs-16 mb-15">替换模板</div>
-                <el-select v-model="templateId" placeholder="请选择">
-                  <el-option
-                    v-for="item in templateList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-                <div slot="footer" class="dialog-footer mt-15 fr">
-                  <el-button
-                    type="primary"
-                    @click="assignSubmit('single')"
-                  >确认</el-button>
-                </div>
-              </div>
-              <el-button
-                slot="reference"
-                size="mini"
-                type="warning"
-                class="ml-0"
-                icon="el-icon-sort"
-                @click="handleClick({ type: 'replace', data: scope.row})"
-              />
-            </el-popover> -->
-            <el-button class="ml-0" type="danger" icon="el-icon-delete" size="mini" @click="handleClick({ type: 'del', data: scope.row})" />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-    <div v-show="searchactiveName == 'companyArr'">
-      <el-table
-        ref="Table"
-        v-loading="tableLoading"
-        :data="companyPackageL"
-        :header-cell-style="{'text-align':'left'}"
-        style="width: 100%"
-      >
-        <el-table-column prop="companyName" width="150" label="公司名" />
-        <el-table-column prop="seatNumber" label="座席数" />
-        <el-table-column label="系统费">￥30</el-table-column>
-        <el-table-column prop="templateName" label="套餐名称" />
-        <el-table-column prop="doubleCallFee" label="双呼价格">
-          <template slot-scope="scope">
-            ￥{{ scope.row.doubleCallFee }}/分钟
-          </template>
-        </el-table-column>
-        <el-table-column prop="rollCallFee" label="CRM线路费">
-          <template slot-scope="scope">
-            ￥{{ scope.row.rollCallFee }}/分钟
-          </template>
-        </el-table-column>
-        <el-table-column prop="talkCallFee" label="拓客线路费">
-          <template slot-scope="scope">
-            ￥{{ scope.row.talkCallFee }}/分钟
-          </template>
-        </el-table-column>
-        <el-table-column prop="deliveryCallFee" label="投流线路费">
-          <template slot-scope="scope">
-            ￥{{ scope.row.deliveryCallFee }}/分钟
-          </template>
-        </el-table-column>
-        <el-table-column prop="tiktokCallFee" label="抖音去显号费">
-          <template slot-scope="scope">
-            ￥{{ scope.row.tiktokCallFee }}/分钟
-          </template>
-        </el-table-column>
-        <el-table-column prop="dmpDeliveryFee" label="dmp投放费">
-          <template slot-scope="scope">
-            ￥{{ scope.row.dmpDeliveryFee }}/条
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" width="135" label="更新时间">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.updateTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作"
-          width="200"
-        >
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              class="ml-0"
-              icon="el-icon-edit"
-              @click="handlecompanyClick(scope.row)"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <el-pagination
-        page-size.sync="20"
-        :total="page.total"
-        :current-page.sync="page.page"
-        style="margin-top: 8px;"
-        layout="total, prev, pager, next"
-        @current-change="currentPage"
-      />
-    </div>
-    <!-- 新建模板 -->
-    <el-dialog
-      append-to-body
-      :close-on-click-modal="false"
-      :visible.sync="templateProp"
-      title="新建模板"
-      width="520px"
-    >
-      <div>
-        <div class="remark-label">模板名</div>
-        <el-input v-model="templateForm.name" type="text" style="width: 300px" placeholder="请输入模板名" />
-      </div>
-      <!-- <div class="mt-10">
-        <div class="remark-label">投流费用</div>
-        <el-input v-model="templateForm.dmpDeliveryFee" type="number" placeholder="请输入投流费用" style="width: 300px;" />
-      </div>
-      <div class="mt-10">
-        <div class="remark-label">双呼价格:(元/分钟)</div>
-        <el-input v-model="templateForm.doubleCallFee" type="number" placeholder="请输入双呼价格" style="width: 300px;" />
-      </div>
-      <div class="mt-10">
-        <div class="remark-label">点呼价格:(元/分钟)</div>
-        <el-input v-model="templateForm.rollCallFee" type="number" placeholder="请输入点呼价格" style="width: 300px;" />
-      </div> -->
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancanlProp">取消</el-button>
-        <el-button
-          :loading="templateLoading"
-          type="primary"
-          @click.native="payFatherTemplateAdd"
-        >确认</el-button>
-      </div>
-    </el-dialog>
-    <!-- 公司费用编辑 -->
-    <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="companyDialog" title="公司设置" width="570px" @close="closeCompany">
-      <el-form ref="companyForm" :inline="true" :model="companyDetail" size="small" label-width="90px">
-        <el-form-item label="公司名" prop="companyName">
-          <el-input v-model="companyDetail.companyName" readonly style="width: 420px;" />
-        </el-form-item>
-        <el-form-item label="双呼价格" prop="doubleCallFee">
-          <el-input v-model.number="companyDetail.doubleCallFee" placeholder="元/分钟" type="number" style="width: 158px;" />
-        </el-form-item>
-        <el-form-item label="CRM线路费" prop="rollCallFee">
-          <el-input v-model="companyDetail.rollCallFee" type="number" placeholder="元/分钟" style="width: 158px;" />
-        </el-form-item>
-        <el-form-item label="拓客线路费" prop="talkCallFee">
-          <el-input v-model="companyDetail.talkCallFee" type="number" placeholder="元/分钟" style="width: 158px;" />
-        </el-form-item>
-        <el-form-item label="投流线路费" prop="deliveryCallFee">
-          <el-input v-model="companyDetail.deliveryCallFee" type="number" placeholder="元/分钟" style="width: 158px;" />
-        </el-form-item>
-        <el-form-item label="抖音去显号" prop="tiktokCallFee">
-          <el-input v-model="companyDetail.tiktokCallFee" type="number" placeholder="元/分钟" style="width: 158px;" />
-        </el-form-item>
-        <el-form-item label="dmp投放费" prop="dmpDeliveryFee">
-          <el-input v-model="companyDetail.dmpDeliveryFee" type="number" placeholder="元/条" style="width: 158px;" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="closeCompany">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="submitCompany">确认</el-button>
-      </div>
-    </el-dialog>
-    <!-- 套餐管理 -->
-    <el-dialog append-to-body :close-on-click-modal="false" :before-close="closePackage" :visible.sync="packageManagement" class="package-prop" title="模板新增" width="680px">
-      <div>
-        <div>
-          <el-button v-if="!addmodular" size="mini" type="primary" icon="el-icon-plus" @click="addmodular = true">新增</el-button>
-          <div v-if="addmodular">
-            <!-- <el-input
-              v-model="subing.baseAmount"
-              clearable
-              size="small"
-              placeholder="系统费"
-              style="width: 120px;"
-              type="Number"
-              class="filter-item mb-10"
-            /> -->
-            <el-input
-              v-model="subing.amount"
-              clearable
-              size="small"
-              placeholder="套餐费"
-              style="width: 120px;"
-              type="Number"
-              class="filter-item mb-10"
-            />
-            <el-input
-              v-model="subing.callDuration "
-              clearable
-              size="small"
-              placeholder="通话时长(分)"
-              style="width: 135px;"
-              type="Number"
-              class="filter-item"
-            />
-            <el-input
-              v-model="subing.packageDay "
-              clearable
-              size="small"
-              placeholder="套餐天数"
-              style="width: 130px;"
-              type="Number"
-              class="filter-item"
-            />
-            <el-switch
-              v-model="subing.weChatFlag"
-              inactive-text="企微权限"
-            />
-            <el-button size="mini" type="primary" @click="clickSubing">确定</el-button>
-            <el-button size="mini" style="margin-left: 0px" @click="cancanlProp">取消</el-button>
-          </div>
-        </div>
-        <el-table ref="table" v-loading="packageLoading" :data="packageList" :header-cell-style="{'text-align':'left'}" style="width: 100%;">
-          <el-table-column :show-overflow-tooltip="true" prop="packageName" width="150" label="套餐名" />
-          <el-table-column :show-overflow-tooltip="true" prop="baseAmount" label="系统费" />
-          <el-table-column :show-overflow-tooltip="true" prop="amount" label="套餐费" />
-          <el-table-column :show-overflow-tooltip="true" prop="callDuration" width="120" label="套餐通话时长(分)" />
-          <el-table-column :show-overflow-tooltip="true" prop="packageDay" width="120" label="套餐时长(天)" />
-          <el-table-column :show-overflow-tooltip="true" prop="weChatFlag" width="120" label="企微添加权限">
-            <template slot-scope="scope">
-              {{ scope.row.weChatFlag ? '已开通': '未开通' }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            width="70"
-            fixed="right"
-          >
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="danger"
-                @click="delPackage(scope.row.id)"
-              >删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import { payTemplateAdd, payTemplateUpdate, payFatherTemplateAdd, payFatherTemplateDel, payFatherTemplateList, payTemplateQuery, getComboList, updateCombo } from '@/api/index'
-const defaultForm = {}
-export default {
-  name: 'PackageManagement',
-  components: {
-    rrOperation,
-    pagination
-  },
-  cruds() {
-    return CRUD({
-      title: '套餐管理',
-      url: 'api-management/api/payFatherTemplate/queryAll',
-      optShow: {
-        add: true,
-        edit: false,
-        del: true,
-        download: false,
-        reset: true
-      }
-    })
-  },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  data() {
-    return {
-      permission: {
-        add: ['admin', 'user:add'],
-        edit: ['admin'],
-        del: ['admin', 'user:del'],
-        download: ['admin', 'user:download'],
-        recharge: false
-      },
-      searchactiveName: 'template',
-      packageManagement: false, // 套餐管理弹框
-      companyPackageL: [], // 公司套餐
-      packageLoading: false,
-      packageList: [],
-      addmodular: false,
-      templateProp: false,
-      templateLoading: false,
-      templateList: [],
-      operationIndex: '', // 当前操作下标
-      templateId: '', // 模板id
-      companyDialog: false, // 公司费用dialog
-      companyDetail: '',
-      loading: false,
-      tableLoading: false,
-      templateForm: { // 套餐
-        name: '',
-        doubleCallFee: '',
-        rollCallFee: '',
-        dmpDeliveryFee: ''
-      },
-      subing: {
-        amount: '',
-        baseAmount: '',
-        callDuration: '',
-        packageDay: '',
-        weChatFlag: false
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入套餐模板名', trigger: 'blur' }
-        ]
-      },
-      page: {
-        total: 0,
-        page: 0
-      }
-    }
-  },
-  mounted() {
-
-  },
-  methods: {
-    async handleClick(params) {
-      const { type, data, idx } = params
-      switch (type) {
-        case 'add':
-          this.packageManagement = true
-          this.templateId = data.id
-          this.payTemplateList()
-          break
-        case 'replace':
-          await this.initTemplate() > 0 && setTimeout(() => {
-            if (this.$refs[`close-popover-${this.operationIndex}`] && this.operationIndex !== idx) {
-              this.$refs[`close-popover-${this.operationIndex}`].doClose()
-            }
-            this.operationIndex = idx
-          }, 100)
-          break
-        case 'del':
-          this.$confirm('确定删除套餐吗？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.toDelete([data.id])
-          })
-          break
-      }
-    },
-    // tab 切换
-    handleTabClick() {
-      if (this.searchactiveName === 'template') {
-        this.crud.toQuery()
-      } else if (this.searchactiveName === 'companyArr') {
-        this.tableLoading = true
-        const page = this.page.page
-        const obj = {
-          page: page - 1,
-          size: 10
-        }
-        getComboList(obj).then(res => {
-          this.companyPackageL = res.content
-          this.page.total = res.totalElements
-          this.tableLoading = false
-        })
-      }
-    },
-    cancanlProp() {
-      this.templateProp = false
-      this.addmodular = false
-      this.templateForm.name = ''
-      this.templateForm.doubleCallFee = ''
-      this.templateForm.rollCallFee = ''
-      this.templateForm.dmpDeliveryFee = ''
-      this.subing.amount = ''
-      this.subing.baseAmount = ''
-      this.subing.callDuration = ''
-      this.subing.packageDay = ''
-      this.subing.weChatFlag = false
-    },
-    handlecompanyClick(params) {
-      this.companyDetail = Object.assign({}, params)
-      this.companyDialog = true
-    },
-    // 关闭函数
-    closeCompany() {
-      this.companyDialog = false
-      this.companyDetail.companyName = ''
-      this.companyDetail.doubleCallFee = ''
-      this.companyDetail.rollCallFee = ''
-      this.companyDetail.talkCallFee = ''
-      this.companyDetail.deliveryCallFee = ''
-      this.companyDetail.tiktokCallFee = ''
-      this.companyDetail.dmpDeliveryFee = ''
-    },
-    // 分页
-    currentPage(val) {
-      this.page.page = val
-      this.handleTabClick()
-    },
-    submitCompany() {
-      this.$refs.companyForm.validate((valid) => {
-        if (valid) {
-          this.loading = true
-          updateCombo(this.companyDetail).then(res => {
-            this.loading = false
-            this.$message.success('编辑成功')
-            this.closeCompany()
-            this.handleTabClick()
-          }).catch(() => {
-            this.loading = false
-          })
-        }
-      })
-    },
-    // 模板列表
-    initTemplate() {
-      return new Promise((resolve, reject) => {
-        payFatherTemplateList().then(res => {
-          this.templateList = res
-          resolve(res.length)
-        }).catch(() => {
-          reject(0)
-        })
-      })
-    },
-    // 新增套餐
-    payFatherTemplateAdd() {
-      this.templateLoading = true
-      payFatherTemplateAdd(this.templateForm).then(res => {
-        this.templateLoading = false
-        this.$message.success('创建成功')
-        this.cancanlProp()
-        this.crud.toQuery()
-      }).catch(() => {
-        this.templateLoading = false
-      })
-    },
-    toDelete(id) {
-      payFatherTemplateDel(id).then(res => {
-        this.$message.success('删除成功')
-        this.crud.refresh()
-      })
-    },
-    closePackage() {
-      this.packageManagement = false
-      this.crud.toQuery()
-    },
-    // 伪删除套餐
-    delPackage(id) {
-      this.$confirm('确定删除套餐吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        payTemplateUpdate({ id: id, status: 1 }).then(res => {
-          this.$message.success('删除成功')
-          this.payTemplateList()
-        }).catch(() => {
-          this.$message.error('操作失败，请刷新重试')
-        })
-      })
-    },
-    // 提交套餐
-    clickSubing() {
-      if (this.subing.amount === '' || this.subing.amount === 0) {
-        this.$message.warning('输入套餐费')
-        return false
-      }
-      if (this.subing.callDuration === '' || this.subing.callDuration === 0) {
-        this.$message.warning('输入套餐通话时长')
-        return false
-      }
-      if (this.subing.packageDay === '' || this.subing.packageDay === 0) {
-        this.$message.warning('输入套餐天数')
-        return false
-      }
-      this.subing.packageName = this.subing.callDuration + '分钟/' + this.subing.amount + '元/月'
-      this.subing.fatherTemplateId = this.templateId
-      payTemplateAdd(this.subing).then(res => {
-        this.$message.success('创建成功')
-        this.cancanlProp()
-        this.payTemplateList()
-      })
-    },
-    payTemplateList() {
-      this.packageLoading = true
-      payTemplateQuery({ fatherTemplateId: this.templateId }).then(res => {
-        this.packageLoading = false
-        this.packageList = res
-      }).catch(() => {
-        this.packageLoading = false
-      })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.app-container ::v-deep .el-tabs {
-  margin-bottom: 0;
-}
-.package-prop ::v-deep .el-dialog__body {
-  padding-top: 10px;
-}
-.remark-label {
-  // min-width: 150px;
-  line-height: 32px;
-  float: none;
-  display: inline-block;
-  font-size: 14px;
-  color: #606266;
-  text-align: right;
-  vertical-align: top;
-  font-weight: 700;
-  padding: 0 12px 0 20px;
-}
-.label{
-  min-width: 80px;
-  line-height: 32px;
-  float: none;
-  display: inline-block;
-  font-size: 14px;
-  color: #606266;
-  text-align: right;
-  vertical-align: middle;
-  font-weight: 700;
-  padding: 0 12px 0 20px;
-}
-.labelGroup {
-  flex-wrap: wrap;
-  div{
-    margin-right: 6px;
-  }
-}
-.input-new-tag {
-  width: 90px;
-  margin-left: 10px;
-  vertical-align: bottom;
-}
-.button-new-tag {
-  height: 32px;
-  line-height: 30px;
-  padding-top: 0;
-  padding-bottom: 0;
-}
-</style>
+<!--
+ * @Description: 套餐管理
+ * @Autor: 飘泊客
+ * @Date: 2022-06-14 15:20:02
+ * @LastEditors: 飘泊客
+ * @LastEditTime: 2023-02-02 13:56:28
+-->
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div>
+        <!-- 搜索 -->
+        <el-input
+          v-model="query.name"
+          clearable
+          size="small"
+          placeholder="输入行业模板名"
+          style="width: 200px;"
+          class="filter-item"
+        />
+        <rrOperation />
+      </div>
+      <div>
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="templateProp = true"
+        >
+          新增模板
+        </el-button>
+        <el-tabs v-model="searchactiveName" @tab-click="handleTabClick">
+          <el-tab-pane label="模板管理" name="template" />
+          <el-tab-pane label="公司列表" name="companyArr" />
+        </el-tabs>
+      </div>
+    </div>
+    <!--表格渲染-->
+    <div v-show="searchactiveName == 'template'">
+      <el-table
+        ref="multipleTable"
+        v-loading="crud.loading"
+        :data="crud.data"
+        :header-cell-style="{'text-align':'left'}"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="expand"
+        >
+          <template slot-scope="props">
+            <el-table
+              ref="childrenTable"
+              :data="props.row.payComboList"
+              :header-cell-style="{'text-align':'left'}"
+            >
+              <el-table-column width="50" />
+              <el-table-column :show-overflow-tooltip="true" prop="packageName" width="150" label="套餐名" />
+              <el-table-column :show-overflow-tooltip="true" prop="baseAmount" label="系统费" />
+              <el-table-column :show-overflow-tooltip="true" prop="amount" label="套餐费" />
+              <el-table-column :show-overflow-tooltip="true" prop="callDuration" label="套餐通话时长(分)" />
+              <el-table-column :show-overflow-tooltip="true" prop="packageDay" label="套餐时长(天)" />
+              <el-table-column :show-overflow-tooltip="true" prop="weChatFlag" label="企微添加权限">
+                <template slot-scope="scope">
+                  {{ scope.row.weChatFlag ? '已开通': '未开通' }}
+                </template>
+              </el-table-column>
+              <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
+                <template slot-scope="scope">
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="模板名"
+        >
+          <template slot-scope="scope">{{ scope.row.name }}</template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" label="投流费用" prop="dmpDeliveryFee" />
+        <el-table-column
+          label="溢出双呼费用/分"
+        >
+          <template slot-scope="scope">{{ scope.row.doubleCallFee }}</template>
+        </el-table-column>
+        <el-table-column
+          label="溢出单呼费用/分"
+        >
+          <template slot-scope="scope">{{ scope.row.rollCallFee }}</template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          width="120"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              class="ml-0"
+              icon="el-icon-edit"
+              @click="handleClick({ type: 'add', data: scope.row})"
+            />
+            <!-- <el-popover
+              :ref="`close-popover-${scope.$index}`"
+              placement="right"
+              width="400"
+              trigger="click"
+            >
+              <div>
+                <div class="el-dialog__title fs-16 mb-15">替换模板</div>
+                <el-select v-model="templateId" placeholder="请选择">
+                  <el-option
+                    v-for="item in templateList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+                <div slot="footer" class="dialog-footer mt-15 fr">
+                  <el-button
+                    type="primary"
+                    @click="assignSubmit('single')"
+                  >确认</el-button>
+                </div>
+              </div>
+              <el-button
+                slot="reference"
+                size="mini"
+                type="warning"
+                class="ml-0"
+                icon="el-icon-sort"
+                @click="handleClick({ type: 'replace', data: scope.row})"
+              />
+            </el-popover> -->
+            <el-button class="ml-0" type="danger" icon="el-icon-delete" size="mini" @click="handleClick({ type: 'del', data: scope.row})" />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <div v-show="searchactiveName == 'companyArr'">
+      <el-table
+        ref="Table"
+        v-loading="tableLoading"
+        :data="companyPackageL"
+        :header-cell-style="{'text-align':'left'}"
+        style="width: 100%"
+      >
+        <el-table-column prop="companyName" width="150" label="公司名" />
+        <el-table-column prop="seatNumber" label="座席数" />
+        <el-table-column label="系统费">￥30</el-table-column>
+        <el-table-column prop="templateName" label="套餐名称" />
+        <el-table-column prop="doubleCallFee" label="双呼价格">
+          <template slot-scope="scope">
+            ￥{{ scope.row.doubleCallFee }}/分钟
+          </template>
+        </el-table-column>
+        <el-table-column prop="rollCallFee" label="CRM线路费">
+          <template slot-scope="scope">
+            ￥{{ scope.row.rollCallFee }}/分钟
+          </template>
+        </el-table-column>
+        <el-table-column prop="talkCallFee" label="拓客线路费">
+          <template slot-scope="scope">
+            ￥{{ scope.row.talkCallFee }}/分钟
+          </template>
+        </el-table-column>
+        <el-table-column prop="deliveryCallFee" label="投流线路费">
+          <template slot-scope="scope">
+            ￥{{ scope.row.deliveryCallFee }}/分钟
+          </template>
+        </el-table-column>
+        <el-table-column prop="tiktokCallFee" label="抖音去显号费">
+          <template slot-scope="scope">
+            ￥{{ scope.row.tiktokCallFee }}/分钟
+          </template>
+        </el-table-column>
+        <el-table-column prop="dmpDeliveryFee" label="dmp投放费">
+          <template slot-scope="scope">
+            ￥{{ scope.row.dmpDeliveryFee }}/条
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" width="135" label="更新时间">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.updateTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          width="75"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              class="ml-0"
+              icon="el-icon-edit"
+              @click="handlecompanyClick(scope.row)"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <el-pagination
+        page-size.sync="20"
+        :total="page.total"
+        :current-page.sync="page.page"
+        style="margin-top: 8px;"
+        layout="total, prev, pager, next"
+        @current-change="currentPage"
+      />
+    </div>
+    <!-- 新建模板 -->
+    <el-dialog
+      append-to-body
+      :close-on-click-modal="false"
+      :visible.sync="templateProp"
+      title="新建模板"
+      width="520px"
+    >
+      <div>
+        <div class="remark-label">模板名</div>
+        <el-input v-model="templateForm.name" type="text" style="width: 300px" placeholder="请输入模板名" />
+      </div>
+      <!-- <div class="mt-10">
+        <div class="remark-label">投流费用</div>
+        <el-input v-model="templateForm.dmpDeliveryFee" type="number" placeholder="请输入投流费用" style="width: 300px;" />
+      </div>
+      <div class="mt-10">
+        <div class="remark-label">双呼价格:(元/分钟)</div>
+        <el-input v-model="templateForm.doubleCallFee" type="number" placeholder="请输入双呼价格" style="width: 300px;" />
+      </div>
+      <div class="mt-10">
+        <div class="remark-label">点呼价格:(元/分钟)</div>
+        <el-input v-model="templateForm.rollCallFee" type="number" placeholder="请输入点呼价格" style="width: 300px;" />
+      </div> -->
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancanlProp">取消</el-button>
+        <el-button
+          :loading="templateLoading"
+          type="primary"
+          @click.native="payFatherTemplateAdd"
+        >确认</el-button>
+      </div>
+    </el-dialog>
+    <!-- 公司费用编辑 -->
+    <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="companyDialog" title="公司设置" width="570px" @close="closeCompany">
+      <el-form ref="companyForm" :inline="true" :model="companyDetail" size="small" label-width="90px">
+        <el-form-item label="公司名" prop="companyName">
+          <el-input v-model="companyDetail.companyName" readonly style="width: 420px;" />
+        </el-form-item>
+        <el-form-item label="双呼价格" prop="doubleCallFee">
+          <el-input v-model.number="companyDetail.doubleCallFee" placeholder="元/分钟" type="number" style="width: 158px;" />
+        </el-form-item>
+        <el-form-item label="CRM线路费" prop="rollCallFee">
+          <el-input v-model="companyDetail.rollCallFee" type="number" placeholder="元/分钟" style="width: 158px;" />
+        </el-form-item>
+        <el-form-item label="拓客线路费" prop="talkCallFee">
+          <el-input v-model="companyDetail.talkCallFee" type="number" placeholder="元/分钟" style="width: 158px;" />
+        </el-form-item>
+        <el-form-item label="投流线路费" prop="deliveryCallFee">
+          <el-input v-model="companyDetail.deliveryCallFee" type="number" placeholder="元/分钟" style="width: 158px;" />
+        </el-form-item>
+        <el-form-item label="抖音去显号" prop="tiktokCallFee">
+          <el-input v-model="companyDetail.tiktokCallFee" type="number" placeholder="元/分钟" style="width: 158px;" />
+        </el-form-item>
+        <el-form-item label="dmp投放费" prop="dmpDeliveryFee">
+          <el-input v-model="companyDetail.dmpDeliveryFee" type="number" placeholder="元/条" style="width: 158px;" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="closeCompany">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitCompany">确认</el-button>
+      </div>
+    </el-dialog>
+    <!-- 套餐管理 -->
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="closePackage" :visible.sync="packageManagement" class="package-prop" title="模板新增" width="680px">
+      <div>
+        <div>
+          <el-button v-if="!addmodular" size="mini" type="primary" icon="el-icon-plus" @click="addmodular = true">新增</el-button>
+          <div v-if="addmodular">
+            <!-- <el-input
+              v-model="subing.baseAmount"
+              clearable
+              size="small"
+              placeholder="系统费"
+              style="width: 120px;"
+              type="Number"
+              class="filter-item mb-10"
+            /> -->
+            <el-input
+              v-model="subing.amount"
+              clearable
+              size="small"
+              placeholder="套餐费"
+              style="width: 120px;"
+              type="Number"
+              class="filter-item mb-10"
+            />
+            <el-input
+              v-model="subing.callDuration "
+              clearable
+              size="small"
+              placeholder="通话时长(分)"
+              style="width: 135px;"
+              type="Number"
+              class="filter-item"
+            />
+            <el-input
+              v-model="subing.packageDay "
+              clearable
+              size="small"
+              placeholder="套餐天数"
+              style="width: 130px;"
+              type="Number"
+              class="filter-item"
+            />
+            <el-switch
+              v-model="subing.weChatFlag"
+              inactive-text="企微权限"
+            />
+            <el-button size="mini" type="primary" @click="clickSubing">确定</el-button>
+            <el-button size="mini" style="margin-left: 0px" @click="cancanlProp">取消</el-button>
+          </div>
+        </div>
+        <el-table ref="table" v-loading="packageLoading" :data="packageList" :header-cell-style="{'text-align':'left'}" style="width: 100%;">
+          <el-table-column :show-overflow-tooltip="true" prop="packageName" width="150" label="套餐名" />
+          <el-table-column :show-overflow-tooltip="true" prop="baseAmount" label="系统费" />
+          <el-table-column :show-overflow-tooltip="true" prop="amount" label="套餐费" />
+          <el-table-column :show-overflow-tooltip="true" prop="callDuration" width="120" label="套餐通话时长(分)" />
+          <el-table-column :show-overflow-tooltip="true" prop="packageDay" width="120" label="套餐时长(天)" />
+          <el-table-column :show-overflow-tooltip="true" prop="weChatFlag" width="120" label="企微添加权限">
+            <template slot-scope="scope">
+              {{ scope.row.weChatFlag ? '已开通': '未开通' }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            width="75"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="danger"
+                @click="delPackage(scope.row.id)"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import { payTemplateAdd, payTemplateUpdate, payFatherTemplateAdd, payFatherTemplateDel, payFatherTemplateList, payTemplateQuery, getComboList, updateCombo } from '@/api/index'
+const defaultForm = {}
+export default {
+  name: 'PackageManagement',
+  components: {
+    rrOperation,
+    pagination
+  },
+  cruds() {
+    return CRUD({
+      title: '套餐管理',
+      url: 'api-management/api/payFatherTemplate/queryAll',
+      optShow: {
+        add: true,
+        edit: false,
+        del: true,
+        download: false,
+        reset: true
+      }
+    })
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      permission: {
+        add: ['admin', 'user:add'],
+        edit: ['admin'],
+        del: ['admin', 'user:del'],
+        download: ['admin', 'user:download'],
+        recharge: false
+      },
+      searchactiveName: 'template',
+      packageManagement: false, // 套餐管理弹框
+      companyPackageL: [], // 公司套餐
+      packageLoading: false,
+      packageList: [],
+      addmodular: false,
+      templateProp: false,
+      templateLoading: false,
+      templateList: [],
+      operationIndex: '', // 当前操作下标
+      templateId: '', // 模板id
+      companyDialog: false, // 公司费用dialog
+      companyDetail: '',
+      loading: false,
+      tableLoading: false,
+      templateForm: { // 套餐
+        name: '',
+        doubleCallFee: '',
+        rollCallFee: '',
+        dmpDeliveryFee: ''
+      },
+      subing: {
+        amount: '',
+        baseAmount: '',
+        callDuration: '',
+        packageDay: '',
+        weChatFlag: false
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入套餐模板名', trigger: 'blur' }
+        ]
+      },
+      page: {
+        total: 0,
+        page: 0
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    async handleClick(params) {
+      const { type, data, idx } = params
+      switch (type) {
+        case 'add':
+          this.packageManagement = true
+          this.templateId = data.id
+          this.payTemplateList()
+          break
+        case 'replace':
+          await this.initTemplate() > 0 && setTimeout(() => {
+            if (this.$refs[`close-popover-${this.operationIndex}`] && this.operationIndex !== idx) {
+              this.$refs[`close-popover-${this.operationIndex}`].doClose()
+            }
+            this.operationIndex = idx
+          }, 100)
+          break
+        case 'del':
+          this.$confirm('确定删除套餐吗？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.toDelete([data.id])
+          })
+          break
+      }
+    },
+    // tab 切换
+    handleTabClick() {
+      if (this.searchactiveName === 'template') {
+        this.crud.toQuery()
+      } else if (this.searchactiveName === 'companyArr') {
+        this.tableLoading = true
+        const page = this.page.page
+        const obj = {
+          page: page - 1,
+          size: 10
+        }
+        getComboList(obj).then(res => {
+          this.companyPackageL = res.content
+          this.page.total = res.totalElements
+          this.tableLoading = false
+        })
+      }
+    },
+    cancanlProp() {
+      this.templateProp = false
+      this.addmodular = false
+      this.templateForm.name = ''
+      this.templateForm.doubleCallFee = ''
+      this.templateForm.rollCallFee = ''
+      this.templateForm.dmpDeliveryFee = ''
+      this.subing.amount = ''
+      this.subing.baseAmount = ''
+      this.subing.callDuration = ''
+      this.subing.packageDay = ''
+      this.subing.weChatFlag = false
+    },
+    handlecompanyClick(params) {
+      this.companyDetail = Object.assign({}, params)
+      this.companyDialog = true
+    },
+    // 关闭函数
+    closeCompany() {
+      this.companyDialog = false
+      this.companyDetail.companyName = ''
+      this.companyDetail.doubleCallFee = ''
+      this.companyDetail.rollCallFee = ''
+      this.companyDetail.talkCallFee = ''
+      this.companyDetail.deliveryCallFee = ''
+      this.companyDetail.tiktokCallFee = ''
+      this.companyDetail.dmpDeliveryFee = ''
+    },
+    // 分页
+    currentPage(val) {
+      this.page.page = val
+      this.handleTabClick()
+    },
+    submitCompany() {
+      this.$refs.companyForm.validate((valid) => {
+        if (valid) {
+          this.loading = true
+          updateCombo(this.companyDetail).then(res => {
+            this.loading = false
+            this.$message.success('编辑成功')
+            this.closeCompany()
+            this.handleTabClick()
+          }).catch(() => {
+            this.loading = false
+          })
+        }
+      })
+    },
+    // 模板列表
+    initTemplate() {
+      return new Promise((resolve, reject) => {
+        payFatherTemplateList().then(res => {
+          this.templateList = res
+          resolve(res.length)
+        }).catch(() => {
+          reject(0)
+        })
+      })
+    },
+    // 新增套餐
+    payFatherTemplateAdd() {
+      this.templateLoading = true
+      payFatherTemplateAdd(this.templateForm).then(res => {
+        this.templateLoading = false
+        this.$message.success('创建成功')
+        this.cancanlProp()
+        this.crud.toQuery()
+      }).catch(() => {
+        this.templateLoading = false
+      })
+    },
+    toDelete(id) {
+      payFatherTemplateDel(id).then(res => {
+        this.$message.success('删除成功')
+        this.crud.refresh()
+      })
+    },
+    closePackage() {
+      this.packageManagement = false
+      this.crud.toQuery()
+    },
+    // 伪删除套餐
+    delPackage(id) {
+      this.$confirm('确定删除套餐吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        payTemplateUpdate({ id: id, status: 1 }).then(res => {
+          this.$message.success('删除成功')
+          this.payTemplateList()
+        }).catch(() => {
+          this.$message.error('操作失败，请刷新重试')
+        })
+      })
+    },
+    // 提交套餐
+    clickSubing() {
+      if (this.subing.amount === '' || this.subing.amount === 0) {
+        this.$message.warning('输入套餐费')
+        return false
+      }
+      if (this.subing.callDuration === '' || this.subing.callDuration === 0) {
+        this.$message.warning('输入套餐通话时长')
+        return false
+      }
+      if (this.subing.packageDay === '' || this.subing.packageDay === 0) {
+        this.$message.warning('输入套餐天数')
+        return false
+      }
+      this.subing.packageName = this.subing.callDuration + '分钟/' + this.subing.amount + '元/月'
+      this.subing.fatherTemplateId = this.templateId
+      payTemplateAdd(this.subing).then(res => {
+        this.$message.success('创建成功')
+        this.cancanlProp()
+        this.payTemplateList()
+      })
+    },
+    payTemplateList() {
+      this.packageLoading = true
+      payTemplateQuery({ fatherTemplateId: this.templateId }).then(res => {
+        this.packageLoading = false
+        this.packageList = res
+      }).catch(() => {
+        this.packageLoading = false
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.app-container ::v-deep .el-tabs {
+  margin-bottom: 0;
+}
+.package-prop ::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+.remark-label {
+  // min-width: 150px;
+  line-height: 32px;
+  float: none;
+  display: inline-block;
+  font-size: 14px;
+  color: #606266;
+  text-align: right;
+  vertical-align: top;
+  font-weight: 700;
+  padding: 0 12px 0 20px;
+}
+.label{
+  min-width: 80px;
+  line-height: 32px;
+  float: none;
+  display: inline-block;
+  font-size: 14px;
+  color: #606266;
+  text-align: right;
+  vertical-align: middle;
+  font-weight: 700;
+  padding: 0 12px 0 20px;
+}
+.labelGroup {
+  flex-wrap: wrap;
+  div{
+    margin-right: 6px;
+  }
+}
+.input-new-tag {
+  width: 90px;
+  margin-left: 10px;
+  vertical-align: bottom;
+}
+.button-new-tag {
+  height: 32px;
+  line-height: 30px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+</style>
diff --git a/src/views/predictiveOutboundCall/index.vue b/src/views/predictiveOutboundCall/index.vue
index 774e0d7..6ea8d71 100644
--- a/src/views/predictiveOutboundCall/index.vue
+++ b/src/views/predictiveOutboundCall/index.vue
@@ -53,8 +53,7 @@
             </el-table-column>
             <el-table-column
               label="操作"
-              width="100"
-              align="left"
+              width="75"
               fixed="right"
             >
               <template slot-scope="scope">
diff --git a/src/views/recharge/billList.vue b/src/views/recharge/billList.vue
index 1a73934..2f0e375 100644
--- a/src/views/recharge/billList.vue
+++ b/src/views/recharge/billList.vue
@@ -1,395 +1,395 @@
-<!--
- * @Description: 充值页
- * @Autor: 飘泊客
- * @Date: 2022-03-11 13:48:26
- * @LastEditors: 飘泊客
- * @LastEditTime: 2023-06-21 15:41:15
--->
-<template>
-  <div class="app-container">
-    <div class="subject">
-      <el-row :gutter="20">
-        <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
-          <el-card class="box-card overflow">
-            <div class="card-item">
-              <div class="u-flex">
-                <img src="@/assets/images/qianbao-icon.png" class="qianbao-icon">
-                <div class="item-left">
-                  <div class="title">可用额度</div>
-                  <div class="text-item">
-                    <span class="line-price">{{ user.userBalance || 0 }}</span>
-                    <el-button size="mini" class="ml-15" type="primary" @click="rechargePay">充值</el-button>
-                  </div>
-                </div>
-              </div>
-              <img src="@/assets/images/qianbao-bj.png" class="qianbao-bj">
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
-          <el-card class="box-card overflow">
-            <div class="card-item">
-              <div class="u-flex">
-                <img src="@/assets/images/qianbao-icon.png" class="qianbao-icon">
-                <div class="item-left">
-                  <div class="title">现金余额</div>
-                  <div class="text-item">
-                    <span class="line-price">{{ user.userBalance || 0 }}</span>
-                  </div>
-                </div>
-              </div>
-              <img src="@/assets/images/qianbao-bj.png" class="qianbao-bj">
-            </div>
-          </el-card>
-        </el-col>
-      </el-row>
-      <div class="upper-bottom">
-        <el-card class="box-card exhibitionBlock">
-          <div class="block-title">月账单概览</div>
-          <el-table
-            :data="monthBillList"
-            stripe
-            :header-cell-style="{'text-align': 'left'}"
-            style="width: 100%"
-          >
-            <el-table-column prop="callMonth" label="账期" width="160" />
-            <el-table-column prop="billDate" label="出账日期" width="160" />
-            <el-table-column prop="total" label="消费金额">
-              <template slot-scope="scope">
-                ￥{{ scope.row.total }}
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" width="120">
-              <template slot-scope="scope">
-                <el-button type="text" @click.stop="doDetail(scope.row.callMonth)">查看详情</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-card>
-      </div>
-      <el-dialog
-        append-to-body
-        :close-on-click-modal="false"
-        :visible.sync="detailDialog"
-        title="月账单详情"
-        width="730px"
-        :show-close="false"
-        class="monthlyDialog"
-        @close="closeDialog"
-      >
-        <div class="u-flex u-flex-between">
-          <span class="dia-title">账单基本信息</span>
-          <el-button type="text" size="mini" :disabled="!monthBillDetail.content" @click="deductDownload">导出账单</el-button>
-        </div>
-        <div class="mt-15">
-          <label class="label">客户名称：</label>
-          <span>{{ monthBillDetail.companyName }}</span>
-        </div>
-        <div class="mt-10">
-          <label class="label">账期：</label>
-          <span>{{ monthBillDetail.chargeBill }}</span>
-        </div>
-        <div class="mt-15 mb-10">
-          <span class="dia-title">账单消费汇总</span>
-        </div>
-        <el-table
-          :data="monthBillDetail.content"
-          stripe
-          :header-cell-style="{'text-align':'left'}"
-          style="width: 100%"
-        >
-          <el-table-column prop="username" label="账号名称" width="200" />
-          <el-table-column label="账号属性">子账号</el-table-column>
-          <el-table-column prop="type" label="费用类型">
-            <template slot-scope="scope">
-              {{ scope.row.type == 1 ? '日结费' : '套餐费' }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="deductAmount" label="费用金额" />
-          <el-table-column prop="deductDuration" label="扣减时间" width="150">
-            <template slot-scope="scope">
-              {{ scope.row.deductDuration }}分钟
-            </template>
-          </el-table-column>
-          <el-table-column prop="status" label="扣减状态">
-            <template slot-scope="scope">
-              {{ scope.row.status ? '扣减成功' : '扣减失败' }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="comboType" label="套餐类型" />
-        </el-table>
-        <el-pagination
-          background
-          :page-size.sync="page.size"
-          :total="page.total"
-          :current-page.sync="page.page"
-          style="margin-top: 8px;"
-          layout="total, prev, pager, next, sizes"
-          @size-change="sizeChangeHandler($event)"
-          @current-change="pageChangeHandler"
-        />
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="detailDialog = false">关闭</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex'
-import { getDeductList, getDeductMonthList, downloadDeduct } from '@/api/index'
-import { downloadFile } from '@/utils/index'
-
-export default {
-  name: 'BillList',
-  data() {
-    return {
-      payType: 1,
-      rechargeAmount: '',
-      detailDialog: false,
-      monthBillList: [], // 月度账单概况
-      page: {
-        page: 1,
-        size: 10,
-        total: 0
-      },
-      monthBillDetail: '', // 月度账单详情
-      month: null
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'user'
-    ])
-  },
-  mounted() {
-    this.init()
-  },
-  methods: {
-    init() {
-      getDeductList().then(res => {
-        this.monthBillList = res.content
-      })
-    },
-    // 账单详情
-    doDetail(month) {
-      if (month) this.month = month
-      const loading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      getDeductMonthList({ queryTime: this.month, page: this.page.page - 1, size: this.page.size }).then(res => {
-        this.monthBillDetail = res
-        this.page.total = res.totalElements
-        console.log(this.page.total)
-        this.detailDialog = true
-        loading.close()
-      }).catch(() => {
-        loading.close()
-      })
-    },
-    pageChangeHandler(e) {
-      this.page.page = e
-      this.doDetail()
-    },
-    sizeChangeHandler(e) {
-      this.page.size = e
-      this.page.page = 1
-      this.doDetail()
-    },
-    // 导出excel
-    deductDownload() {
-      downloadDeduct({ queryTime: this.monthBillDetail.chargeBill }).then(res => {
-        downloadFile(res, '任务统计数据', 'xlsx')
-      })
-    },
-    rechargePay() {
-      this.$router.push({ path: '/recharge/recharge' })
-    },
-    closeDialog() {
-      this.page.page = 1
-      this.page.size = 10
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-  ::v-deep .el-radio__label{
-    display: flex;
-    align-items: center;
-  }
-  ::v-deep .el-radio__input.is-checked+.el-radio__label {
-    color: #1890ff;
-  }
-  ::v-deep .el-radio__input.is-checked .el-radio__inner {
-    border-color: #1890ff;
-    background: #1890ff;
-  }
-  .monthlyDialog ::v-deep .el-dialog__body {
-    padding-top: 0;
-  }
-  .app-container {
-    background: #f0f2f5;
-    padding: 0;
-    padding-top: 20px;
-  }
-  .card-item {
-    display: flex;
-    justify-content: space-between;
-    position: relative;
-    .item-left {
-      margin-left: 15px;
-      line-height: 30px;
-    }
-    .title {
-      font-size: 16px;
-      font-weight: 500;
-      color: rgba(0,0,0,0.65);
-    }
-    .line-price {
-      font-weight: 600;
-      color: #F86E21;
-      font-size: 20px;
-    }
-    .qianbao-icon {
-      width: 40px;
-      height: 40px;
-    }
-    .qianbao-bj {
-      width: 68px;
-      height: 68px;
-      position: absolute;
-      right: 0px;
-      top: 15px;
-    }
-  }
-  .monthlyDialog {
-    .dia-title {
-      font-size: 15px;
-      font-weight: 600;
-      color: #181818;
-    }
-    .label {
-      font-weight: 500;
-      display: inline-block;
-      width: 100px;
-      text-align: right;
-    }
-  }
-  .toptitle {
-    padding: 12px 0;
-    // border-bottom: 1px solid #d4d3d3;
-    margin: 0 0 12px;
-    height: auto;
-    line-height: normal;
-    span:nth-child(1) {
-      color: #181818;
-      font-size: 14px;
-      height: 24px;
-      line-height: 24px;
-      vertical-align: middle;
-    }
-    span:nth-child(2) {
-      display: block;
-      color: #909399;
-      font-size: 13px;
-      margin-top: 12px;
-    }
-  }
-  .upper-bottom {
-    // background: #F0F0F0;
-    // width: 100%;
-    // min-height: calc(100vh - 170px);
-  }
-  .overflow {
-    position: relative;
-    top: -20px;
-  }
-  .block-title {
-    font-size: 16px;
-    font-weight: 600;
-    color: #000000;
-    margin-bottom: 20px;
-  }
-  .exhibitionBlock {
-    margin: auto;
-    .horndiv {
-      width: 100%;
-      transform-origin: center top;
-      z-index: 2074;
-      background: #F0F0F0;
-      height: 60px;
-      margin: auto;
-      margin-top: 15px;
-      padding: 15px;
-      span:nth-child(1) {
-        margin-bottom: 5px;
-      }
-      span {
-        color: #606266;
-        font-size: 14px;
-      }
-    }
-  }
-  .subject {
-    width: 100%;
-    position: relative;
-    box-sizing: border-box;
-  }
-  .c-title {
-    font-size: 14px;
-    color: black;
-    font-size: 14px;
-    img {
-      width: 30px;
-      height: 30px;;
-      border-radius: 50%;
-      margin-right: 5px;
-    }
-  }
-  .line-price {
-    color: #FF9C00;
-    font-size: 19px;
-    font-weight: 600;
-    vertical-align: middle;
-  }
-  .line-price:before {
-    content: '￥';
-    font-size: 19px;
-  }
-  .topinput {
-    line-height: 30px;
-  }
-  .text-item {
-    font-size: 17px;
-    color: #181818;
-  }
-  .radio-content {
-    width: 80%;
-  }
-
-  .yellow{
-    color: rgb(238, 103, 35);
-  }
-  .backicon:hover{
-    cursor: pointer;
-  }
-  .red{
-    color: red;
-  }
-  .lin-title {
-    font-size: 14px;
-    box-sizing: border-box;
-    margin-right: 10px;
-    margin-left: 2px;
-    color:#999999
-  }
-  .lin-text {
-    font-size: 12px;
-    color: red;
-    padding-left: 170px;
-    margin-top: 6px
-  }
-</style>
+<!--
+ * @Description: 充值页
+ * @Autor: 飘泊客
+ * @Date: 2022-03-11 13:48:26
+ * @LastEditors: 飘泊客
+ * @LastEditTime: 2023-06-21 15:41:15
+-->
+<template>
+  <div class="app-container">
+    <div class="subject">
+      <el-row :gutter="20">
+        <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
+          <el-card class="box-card overflow">
+            <div class="card-item">
+              <div class="u-flex">
+                <img src="@/assets/images/qianbao-icon.png" class="qianbao-icon">
+                <div class="item-left">
+                  <div class="title">可用额度</div>
+                  <div class="text-item">
+                    <span class="line-price">{{ user.userBalance || 0 }}</span>
+                    <el-button size="mini" class="ml-15" type="primary" @click="rechargePay">充值</el-button>
+                  </div>
+                </div>
+              </div>
+              <img src="@/assets/images/qianbao-bj.png" class="qianbao-bj">
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
+          <el-card class="box-card overflow">
+            <div class="card-item">
+              <div class="u-flex">
+                <img src="@/assets/images/qianbao-icon.png" class="qianbao-icon">
+                <div class="item-left">
+                  <div class="title">现金余额</div>
+                  <div class="text-item">
+                    <span class="line-price">{{ user.userBalance || 0 }}</span>
+                  </div>
+                </div>
+              </div>
+              <img src="@/assets/images/qianbao-bj.png" class="qianbao-bj">
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+      <div class="upper-bottom">
+        <el-card class="box-card exhibitionBlock">
+          <div class="block-title">月账单概览</div>
+          <el-table
+            :data="monthBillList"
+            stripe
+            :header-cell-style="{'text-align': 'left'}"
+            style="width: 100%"
+          >
+            <el-table-column prop="callMonth" label="账期" width="160" />
+            <el-table-column prop="billDate" label="出账日期" width="160" />
+            <el-table-column prop="total" label="消费金额">
+              <template slot-scope="scope">
+                ￥{{ scope.row.total }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button type="text" @click.stop="doDetail(scope.row.callMonth)">查看详情</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </div>
+      <el-dialog
+        append-to-body
+        :close-on-click-modal="false"
+        :visible.sync="detailDialog"
+        title="月账单详情"
+        width="730px"
+        :show-close="false"
+        class="monthlyDialog"
+        @close="closeDialog"
+      >
+        <div class="u-flex u-flex-between">
+          <span class="dia-title">账单基本信息</span>
+          <el-button type="text" size="mini" :disabled="!monthBillDetail.content" @click="deductDownload">导出账单</el-button>
+        </div>
+        <div class="mt-15">
+          <label class="label">客户名称：</label>
+          <span>{{ monthBillDetail.companyName }}</span>
+        </div>
+        <div class="mt-10">
+          <label class="label">账期：</label>
+          <span>{{ monthBillDetail.chargeBill }}</span>
+        </div>
+        <div class="mt-15 mb-10">
+          <span class="dia-title">账单消费汇总</span>
+        </div>
+        <el-table
+          :data="monthBillDetail.content"
+          stripe
+          :header-cell-style="{'text-align':'left'}"
+          style="width: 100%"
+        >
+          <el-table-column prop="username" label="账号名称" width="200" />
+          <el-table-column label="账号属性">子账号</el-table-column>
+          <el-table-column prop="type" label="费用类型">
+            <template slot-scope="scope">
+              {{ scope.row.type == 1 ? '日结费' : '套餐费' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="deductAmount" label="费用金额" />
+          <el-table-column prop="deductDuration" label="扣减时间" width="150">
+            <template slot-scope="scope">
+              {{ scope.row.deductDuration }}分钟
+            </template>
+          </el-table-column>
+          <el-table-column prop="status" label="扣减状态">
+            <template slot-scope="scope">
+              {{ scope.row.status ? '扣减成功' : '扣减失败' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="comboType" label="套餐类型" />
+        </el-table>
+        <el-pagination
+          background
+          :page-size.sync="page.size"
+          :total="page.total"
+          :current-page.sync="page.page"
+          style="margin-top: 8px;"
+          layout="total, prev, pager, next, sizes"
+          @size-change="sizeChangeHandler($event)"
+          @current-change="pageChangeHandler"
+        />
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="detailDialog = false">关闭</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex'
+import { getDeductList, getDeductMonthList, downloadDeduct } from '@/api/index'
+import { downloadFile } from '@/utils/index'
+
+export default {
+  name: 'BillList',
+  data() {
+    return {
+      payType: 1,
+      rechargeAmount: '',
+      detailDialog: false,
+      monthBillList: [], // 月度账单概况
+      page: {
+        page: 1,
+        size: 10,
+        total: 0
+      },
+      monthBillDetail: '', // 月度账单详情
+      month: null
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'user'
+    ])
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      getDeductList().then(res => {
+        this.monthBillList = res.content
+      })
+    },
+    // 账单详情
+    doDetail(month) {
+      if (month) this.month = month
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      getDeductMonthList({ queryTime: this.month, page: this.page.page - 1, size: this.page.size }).then(res => {
+        this.monthBillDetail = res
+        this.page.total = res.totalElements
+        console.log(this.page.total)
+        this.detailDialog = true
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    },
+    pageChangeHandler(e) {
+      this.page.page = e
+      this.doDetail()
+    },
+    sizeChangeHandler(e) {
+      this.page.size = e
+      this.page.page = 1
+      this.doDetail()
+    },
+    // 导出excel
+    deductDownload() {
+      downloadDeduct({ queryTime: this.monthBillDetail.chargeBill }).then(res => {
+        downloadFile(res, '任务统计数据', 'xlsx')
+      })
+    },
+    rechargePay() {
+      this.$router.push({ path: '/recharge/recharge' })
+    },
+    closeDialog() {
+      this.page.page = 1
+      this.page.size = 10
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  ::v-deep .el-radio__label{
+    display: flex;
+    align-items: center;
+  }
+  ::v-deep .el-radio__input.is-checked+.el-radio__label {
+    color: #1890ff;
+  }
+  ::v-deep .el-radio__input.is-checked .el-radio__inner {
+    border-color: #1890ff;
+    background: #1890ff;
+  }
+  .monthlyDialog ::v-deep .el-dialog__body {
+    padding-top: 0;
+  }
+  .app-container {
+    background: #f0f2f5;
+    padding: 0;
+    padding-top: 20px;
+  }
+  .card-item {
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+    .item-left {
+      margin-left: 15px;
+      line-height: 30px;
+    }
+    .title {
+      font-size: 16px;
+      font-weight: 500;
+      color: rgba(0,0,0,0.65);
+    }
+    .line-price {
+      font-weight: 600;
+      color: #F86E21;
+      font-size: 20px;
+    }
+    .qianbao-icon {
+      width: 40px;
+      height: 40px;
+    }
+    .qianbao-bj {
+      width: 68px;
+      height: 68px;
+      position: absolute;
+      right: 0px;
+      top: 15px;
+    }
+  }
+  .monthlyDialog {
+    .dia-title {
+      font-size: 15px;
+      font-weight: 600;
+      color: #181818;
+    }
+    .label {
+      font-weight: 500;
+      display: inline-block;
+      width: 100px;
+      text-align: right;
+    }
+  }
+  .toptitle {
+    padding: 12px 0;
+    // border-bottom: 1px solid #d4d3d3;
+    margin: 0 0 12px;
+    height: auto;
+    line-height: normal;
+    span:nth-child(1) {
+      color: #181818;
+      font-size: 14px;
+      height: 24px;
+      line-height: 24px;
+      vertical-align: middle;
+    }
+    span:nth-child(2) {
+      display: block;
+      color: #909399;
+      font-size: 13px;
+      margin-top: 12px;
+    }
+  }
+  .upper-bottom {
+    // background: #F0F0F0;
+    // width: 100%;
+    // min-height: calc(100vh - 170px);
+  }
+  .overflow {
+    position: relative;
+    top: -20px;
+  }
+  .block-title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #000000;
+    margin-bottom: 20px;
+  }
+  .exhibitionBlock {
+    margin: auto;
+    .horndiv {
+      width: 100%;
+      transform-origin: center top;
+      z-index: 2074;
+      background: #F0F0F0;
+      height: 60px;
+      margin: auto;
+      margin-top: 15px;
+      padding: 15px;
+      span:nth-child(1) {
+        margin-bottom: 5px;
+      }
+      span {
+        color: #606266;
+        font-size: 14px;
+      }
+    }
+  }
+  .subject {
+    width: 100%;
+    position: relative;
+    box-sizing: border-box;
+  }
+  .c-title {
+    font-size: 14px;
+    color: black;
+    font-size: 14px;
+    img {
+      width: 30px;
+      height: 30px;;
+      border-radius: 50%;
+      margin-right: 5px;
+    }
+  }
+  .line-price {
+    color: #FF9C00;
+    font-size: 19px;
+    font-weight: 600;
+    vertical-align: middle;
+  }
+  .line-price:before {
+    content: '￥';
+    font-size: 19px;
+  }
+  .topinput {
+    line-height: 30px;
+  }
+  .text-item {
+    font-size: 17px;
+    color: #181818;
+  }
+  .radio-content {
+    width: 80%;
+  }
+
+  .yellow{
+    color: rgb(238, 103, 35);
+  }
+  .backicon:hover{
+    cursor: pointer;
+  }
+  .red{
+    color: red;
+  }
+  .lin-title {
+    font-size: 14px;
+    box-sizing: border-box;
+    margin-right: 10px;
+    margin-left: 2px;
+    color:#999999
+  }
+  .lin-text {
+    font-size: 12px;
+    color: red;
+    padding-left: 170px;
+    margin-top: 6px
+  }
+</style>
diff --git a/src/views/resourceBundleManagement/index.vue b/src/views/resourceBundleManagement/index.vue
index 6c9f74f..6f752ff 100644
--- a/src/views/resourceBundleManagement/index.vue
+++ b/src/views/resourceBundleManagement/index.vue
@@ -1,637 +1,637 @@
-<template>
-  <div class="app-container">
-    <!-- 检测指标 -->
-    <el-row class="detectQuantityArea">
-      <el-col
-        :span="6"
-        :offset="4"
-        style="border:1px solid #dcdfe6;padding: 10px;"
-      >
-        <div>
-          <div style="display: flex;">
-            <span
-              class="quantityName"
-              style="margin-right: 130px;"
-            >资源总分配数目</span>
-            <i class="el-icon-warning-outline quantityName" />
-          </div>
-          <div class="keyQuantity">{{ statisticsData.totalNum }}</div>
-          <p>
-            <span
-              class="quantityName"
-              style="margin-right: 12px;"
-            >昨日分配</span>
-            <i class="el-icon-caret-top" style="color: #a4d783;" />
-            <span style="margin-right: 12px;">{{
-              statisticsData.yesterdayNum
-            }}</span>
-            <span
-              class="quantityName"
-              style="margin-right: 12px;"
-            >今日分配</span>
-            <i class="el-icon-caret-bottom" style="color: #e13c39;" />
-            <span style="margin-right: 12px;">{{
-              statisticsData.todayNum
-            }}</span>
-          </p>
-        </div>
-      </el-col>
-      <el-col
-        :span="6"
-        :offset="4"
-        style="border:1px solid #dcdfe6;padding: 10px;"
-      >
-        <div>
-          <div style="display: flex;">
-            <span
-              class="quantityName"
-              style="margin-right: 130px;"
-            >话费总分配数目</span>
-            <i class="el-icon-warning-outline quantityName" />
-          </div>
-          <div class="keyQuantity">{{ statisticsData.totalBill }}</div>
-          <p>
-            <span
-              class="quantityName"
-              style="margin-right: 12px;"
-            >昨日分配</span>
-            <i class="el-icon-caret-top" style="color: #a4d783;" />
-            <span style="margin-right: 12px;">{{
-              statisticsData.yesterdayBill
-            }}</span>
-            <span
-              class="quantityName"
-              style="margin-right: 12px;"
-            >今日分配</span>
-            <i class="el-icon-caret-bottom" style="color: #e13c39;" />
-            <span style="margin-right: 12px;">{{
-              statisticsData.todayBill
-            }}</span>
-          </p>
-        </div>
-      </el-col>
-    </el-row>
-    <!-- 工具栏、表格 -->
-    <el-row :gutter="20">
-      <!-- 工具栏 -->
-      <div class="head-container">
-        <!-- 左侧添加账号、批量禁用 -->
-        <crudOperation show="" :permission="permission" :is-show="true">
-          <template v-slot:right>
-            <!-- <el-button
-              class="filter-item"
-              size="mini"
-              type="primary"
-              @click="batchActivation"
-              >批量设置</el-button
-            > -->
-          </template>
-        </crudOperation>
-        <!-- 右侧搜索、筛选 -->
-        <div v-if="crud.props.searchToggle">
-          <!-- 搜索 -->
-          <el-input
-            v-model="query.channelName"
-            clearable
-            size="small"
-            placeholder="请输入代理商名称"
-            style="width: 200px;"
-            class="filter-item"
-            @keyup.enter.native="crud.toQuery"
-          />
-          <rrOperation />
-        </div>
-      </div>
-      <!-- 表格 -->
-      <el-table
-        ref="tables"
-        v-loading="crud.loading"
-        :data="crud.data"
-        style="width: 100%;margin-bottom: 20px;"
-        :header-cell-style="{ 'text-align': 'left' }"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="channelName"
-          label="名称"
-        />
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="totalNum"
-          label="资源总分配量"
-          sortable
-          width="120"
-        />
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="surplusNum"
-          label="资源兑换余量"
-          sortable
-          width="120"
-        />
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="totalPhoneBill"
-          label="话费总分配量"
-          sortable
-          width="120"
-        />
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="surplusPhoneBill"
-          label="话费兑换余量"
-          sortable
-          width="120"
-        />
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="purchaseTime"
-          label="最近购包时间"
-          sortable
-        >
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.purchaseTime ? parseTime(scope.row.purchaseTime) : "——"
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="createTime"
-          label="创建时间"
-          sortable
-        >
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.createTime ? parseTime(scope.row.createTime) : "——"
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="200">
-          <template slot-scope="scope">
-            <div style="display: flex;align-items: center;">
-              <el-button
-                slot="reference"
-                class="popover-item"
-                type="text"
-                @click="allotmentQuantity(scope.row)"
-              >
-                配量
-              </el-button>
-              <span style="color: #d7d7d7;margin:0 5px;">|</span>
-              <el-button
-                slot="reference"
-                class="popover-item"
-                type="text"
-                @click="detail(scope.row)"
-              >
-                详情</el-button>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </el-row>
-    <!-- 配量设置弹出框 -->
-    <el-dialog
-      append-to-body
-      :close-on-click-modal="false"
-      :visible.sync="allotmentQuantityDialogVisible"
-      title="配量设置"
-      width="570px"
-      @close="allotmentQuantityDialogClose"
-    >
-      <el-form
-        ref="allotmentQuantityFormRef"
-        :inline="true"
-        :model="channelCustom"
-        size="small"
-        label-width="100px"
-      >
-        <el-form-item label="代理商名称: " style="width:330px">
-          <span>{{ channelCustom.channelName }}</span>
-        </el-form-item>
-        <el-form-item label="分配数量: ">
-          <el-input-number
-            ref="refNumber"
-            v-model="channelCustom.assignNum"
-            controls-position="right"
-            :min="0"
-            @input.native="eventDisposalRangeChange()"
-          />
-          <span style="margin-left: 10px;">个</span>
-        </el-form-item>
-        <el-form-item label="分配话费: ">
-          <el-input-number
-            ref="refNumber"
-            v-model="channelCustom.assignBill"
-            controls-position="right"
-            :min="0"
-            @input.native="eventDisposalRangeChange()"
-          />
-          <span style="margin-left: 10px;">分钟</span>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button
-          :loading="allotmentQuantityDialogSubmitLoading"
-          type="primary"
-          @click="allotmentQuantitySubmit"
-        >提交</el-button>
-        <el-button
-          type="text"
-          @click="allotmentQuantityDialogClose"
-        >取消</el-button>
-      </div>
-    </el-dialog>
-    <!-- 详情弹出框 -->
-    <el-dialog
-      append-to-body
-      :close-on-click-modal="false"
-      :visible.sync="detailDialogVisible"
-      title="详情"
-      width="630px"
-      @close="detailDialogClose"
-    >
-      <p class="dialogTitle" style="margin-bottom: 20px;">
-        代理商: {{ channelCustom.channelName }}
-      </p>
-      <p class="dialogTitle" style="margin-bottom: 20px;">分配记录</p>
-      <div style="margin-bottom: 40px;">
-        <span class="dialogTitle">选择日期: </span>
-        <date-range-picker
-          v-model="createTime"
-          class="date-item"
-          @change="dateRangePickerChange"
-        />
-      </div>
-      <el-table
-        ref="tables"
-        v-loading="pictLoading"
-        :data="detailList"
-        style="width: 100%;margin-bottom: 20px;"
-        :header-cell-style="{ 'text-align': 'left' }"
-      >
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="createTime"
-          label="分配时间"
-        >
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.createTime ? parseTime(scope.row.createTime) : "——"
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="assignNum"
-          label="分配数目"
-        />
-        <el-table-column
-          :show-overflow-tooltip="true"
-          prop="assignName"
-          label="分配人员"
-        />
-      </el-table>
-      <!--详情弹出框中的分页-->
-      <!-- <el-pagination
-        background
-        :page-size="size"
-        :page-sizes="pageSizes"
-        :total="total"
-        :current-page="page"
-        style="margin-top: 8px;"
-        layout="total, prev, pager, next, sizes"
-        @size-change="sizeChange"
-        @current-change="currentChange"
-      /> -->
-      <!-- 分页 -->
-      <el-pagination
-        background
-        :page-size="size"
-        :total="total"
-        :page-sizes="pageSizes"
-        :current-page="page"
-        style="margin-top: 8px;"
-        layout="total, prev, pager, next, sizes"
-        @size-change="sizeChange"
-        @current-change="currentChange"
-      />
-      <!-- <pagination /> -->
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import crudUser from '@/api/system/user'
-// import { isvalidPhone } from '@/utils/validate'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import pagination from '@crud/Pagination'
-import DateRangePicker from '@/components/DateRangePicker'
-import { mapGetters } from 'vuex'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import {
-  allotmentQuantity,
-  allocationRecord,
-  statistics
-} from '@/api/resourceBundleManagement/index'
-// import { parseTime } from '@/utils/index'
-const defaultForm = {
-  id: null,
-  username: null,
-  nickName: null,
-  gender: '渠道商账号',
-  email: null,
-  enabled: 'false',
-  turnCrmNum: 50,
-  roles: [],
-  jobs: [],
-  dept: { id: null },
-  phone: null
-}
-export default {
-  name: 'User',
-  components: {
-    crudOperation,
-    rrOperation,
-    pagination,
-    DateRangePicker
-  },
-  cruds() {
-    return CRUD({
-      // title: "配量设置",
-      url: '/api-management/api/resource/queryAll',
-      crudMethod: { ...crudUser },
-      optShow: {}
-      // params: { page: 0, sort: 0 }
-      // props: { dowmapi: "api-management/api/users" }
-    })
-  },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  data() {
-    // 自定义验证
-    // const validPhone = (rule, value, callback) => {
-    //   if (!value) {
-    //     callback(new Error('请输入电话号码'))
-    //   } else if (!isvalidPhone(value)) {
-    //     callback(new Error('请输入正确的11位手机号码'))
-    //   } else {
-    //     callback()
-    //   }
-    // }
-    return {
-      height: document.documentElement.clientHeight - 180 + 'px;',
-      defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
-      permission: {
-        add: ['admin', 'user:add'],
-        edit: ['admin', 'user:edit'],
-        del: ['admin', 'user:del'],
-        download: ['admin', 'user:download'],
-        more: true,
-        // recharge: true,
-        delUser: true
-      },
-      // 统计数据
-      statisticsData: {},
-      // 配量表单数据
-      channelCustom: {
-        channelName: '',
-        assignNum: 0,
-        assignBill: 0,
-        channelld: ''
-      },
-      // 配量设置弹出框确认Loading
-      allotmentQuantityDialogSubmitLoading: false,
-      // 配量设置弹出框控制显隐
-      allotmentQuantityDialogVisible: false,
-      // 详情弹出框控制显隐
-      detailDialogVisible: false,
-      // 详情表格数据
-      // detailList: [],
-      // 渠道商id
-      channelMerchantId: '',
-      // 时间选择器
-      createTime: [],
-      // 分页
-      page: 1, // 第几页
-      size: 10, // 一页多少条
-      total: 0, // 总条目数
-      pageSizes: [10, 20, 30, 40, 50, 100], // 可选择的一页多少条
-      detailList: [], // 表格绑定的数据
-      allData: [],
-      // 控制loading
-      pictLoading: false
-    }
-  },
-
-  computed: {
-    ...mapGetters(['user'])
-  },
-  created() {
-    this.crud.msg.add = '新增成功，默认密码：123456'
-    this.getStatisticsData()
-  },
-  mounted: function() {
-    const that = this
-    window.onresize = function temp() {
-      that.height = document.documentElement.clientHeight - 180 + 'px;'
-    }
-  },
-  methods: {
-    // 获取统计数据
-    async getStatisticsData() {
-      const res = await statistics()
-      if (res.status === 0) {
-        this.statisticsData = res.data
-      } else {
-        this.$message.error(res.msg)
-      }
-    },
-    // 批量设置
-    // async batchActivation() {
-    //   const res = await activateAndActivate(this.ids);
-    //   if (res.status === 0) {
-    //     this.$message.success("操作成功");
-    //     this.crud.toQuery();
-    //   } else {
-    //     this.$message.error(res.msg);
-    //   }
-    //   console.log(res, "res");
-    // },
-    // 打开配量弹出框
-    allotmentQuantity(data) {
-      this.allotmentQuantityDialogVisible = true
-      this.channelCustom.channelName = data.channelName
-      this.channelMerchantId = data.id
-    },
-    // 计数器
-    eventDisposalRangeChange(val) {
-      console.log(val, 'val')
-      const key = this.$refs.refNumber.displayValue
-      this.num = String(key).replace(/[^\d]/g, '')
-      // console.log(this.$refs.num("num"), ' this.$refs.num("num")');
-      // if (val !== undefined) {
-      //   this.$refs.num("num");
-      // }
-    },
-    // 配量设置弹出框关闭
-    allotmentQuantityDialogClose() {
-      this.allotmentQuantityDialogVisible = false
-      this.channelCustom.assignNum = 0
-      this.channelCustom.assignBill = 0
-      // this.$refs["allotmentQuantityFormRef"].clearValidate();
-    },
-    // 配量表单提交
-    allotmentQuantitySubmit() {
-      this.$refs['allotmentQuantityFormRef'].validate(valid => {
-        if (valid) {
-          this.allotmentQuantityDialogSubmitLoading = true
-          allotmentQuantity(
-            this.channelMerchantId,
-            this.channelCustom.assignNum,
-            this.channelCustom.assignBill
-          )
-            .then(res => {
-              this.allotmentQuantityDialogSubmitLoading = false
-              if (res.status === 0) {
-                this.$message.success('操作成功')
-                this.allotmentQuantityDialogClose()
-                this.crud.toQuery()
-                this.getStatisticsData()
-              } else {
-                this.$message.error(res.msg)
-              }
-            })
-            .catch(() => {
-              this.allotmentQuantityDialogSubmitLoading = false
-            })
-        } else {
-          return false
-        }
-      })
-    },
-    // 打开详情弹出框
-    async detail(data) {
-      this.channelMerchantId = data.id
-      this.page = 1
-      this.size = 10
-      this.getActivationCodeForm()
-      // const res = await allocationRecord({
-      //   channelId: data.id,
-      //   page: this.page - 1,
-      //   size: this.size
-      // })
-      // this.detailList = res.content
-      this.detailDialogVisible = true
-      this.channelCustom.channelName = data.channelName
-    },
-    // 详情弹出框关闭
-    detailDialogClose() {
-      this.detailDialogVisible = false
-      this.createTime = []
-      // this.$refs['allotmentQuantityFormRef'].clearValidate()
-    },
-    // 日期选择器change事件
-    async dateRangePickerChange(val) {
-      this.createTime = val
-      const res = await allocationRecord({
-        channelId: this.channelMerchantId,
-        createTime: this.createTime,
-        page: this.page - 1,
-        size: this.size
-      })
-      this.detailList = res.content
-      this.total = res.totalElements
-    },
-    // 获取表格数据
-    async getActivationCodeForm() {
-      this.pictLoading = true
-      await allocationRecord({
-        createTime: this.createTime,
-        channelId: this.channelMerchantId,
-        page: this.page - 1,
-        size: this.size
-      }).then(res => {
-        const data = JSON.parse(JSON.stringify(res))
-        this.detailList = data.content.splice(0, this.size)
-        this.total = data.totalElements
-        this.pictLoading = false
-      }).catch(() => {
-        this.pictLoading = false
-      })
-      // const res = await getActivationCodeForm({
-      //   page: this.page - 1,
-      //   size: this.size
-      // })
-
-      // data.content.forEach(item => {
-      //   const time = parseTime(item.createTime)
-      //   item.createTime = time
-      //   // if (item.codeType == '3') {
-      //   //   item.codeType = '季卡'
-      //   // } else if (item.codeType == '2') {
-      //   //   item.codeType = '年卡'
-      //   // }
-      // })
-    },
-    currentChange(val) {
-      console.log(val, '123')
-      this.page = val
-      this.getActivationCodeForm()
-    },
-    sizeChange(val) {
-      console.log(val, 'val')
-      this.size = val
-      this.page = 1
-      this.getActivationCodeForm()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.head-container {
-  display: flex;
-  align-items: center;
-}
-//监测数量区域
-.detectQuantityArea {
-  font-size: 14px;
-  margin-bottom: 50px;
-}
-//数量名称
-.quantityName {
-  color: #909399;
-}
-//重点数量
-.keyQuantity {
-  font-size: 25px;
-  margin-top: 15px;
-}
-.popover-item {
-  display: block;
-  cursor: pointer;
-  height: 30px;
-  font-size: 13px;
-  text-align: center;
-  span {
-    padding: 0 15px;
-  }
-}
-.popover-item:hover {
-  background: #e8f4ff;
-}
-//弹出框日期label样式
-::v-deep .y-label {
-  vertical-align: unset;
-  min-width: unset;
-}
-.el-pagination {
-  text-align: right;
-}
-</style>
+<template>
+  <div class="app-container">
+    <!-- 检测指标 -->
+    <el-row class="detectQuantityArea">
+      <el-col
+        :span="6"
+        :offset="4"
+        style="border:1px solid #dcdfe6;padding: 10px;"
+      >
+        <div>
+          <div style="display: flex;">
+            <span
+              class="quantityName"
+              style="margin-right: 130px;"
+            >资源总分配数目</span>
+            <i class="el-icon-warning-outline quantityName" />
+          </div>
+          <div class="keyQuantity">{{ statisticsData.totalNum }}</div>
+          <p>
+            <span
+              class="quantityName"
+              style="margin-right: 12px;"
+            >昨日分配</span>
+            <i class="el-icon-caret-top" style="color: #a4d783;" />
+            <span style="margin-right: 12px;">{{
+              statisticsData.yesterdayNum
+            }}</span>
+            <span
+              class="quantityName"
+              style="margin-right: 12px;"
+            >今日分配</span>
+            <i class="el-icon-caret-bottom" style="color: #e13c39;" />
+            <span style="margin-right: 12px;">{{
+              statisticsData.todayNum
+            }}</span>
+          </p>
+        </div>
+      </el-col>
+      <el-col
+        :span="6"
+        :offset="4"
+        style="border:1px solid #dcdfe6;padding: 10px;"
+      >
+        <div>
+          <div style="display: flex;">
+            <span
+              class="quantityName"
+              style="margin-right: 130px;"
+            >话费总分配数目</span>
+            <i class="el-icon-warning-outline quantityName" />
+          </div>
+          <div class="keyQuantity">{{ statisticsData.totalBill }}</div>
+          <p>
+            <span
+              class="quantityName"
+              style="margin-right: 12px;"
+            >昨日分配</span>
+            <i class="el-icon-caret-top" style="color: #a4d783;" />
+            <span style="margin-right: 12px;">{{
+              statisticsData.yesterdayBill
+            }}</span>
+            <span
+              class="quantityName"
+              style="margin-right: 12px;"
+            >今日分配</span>
+            <i class="el-icon-caret-bottom" style="color: #e13c39;" />
+            <span style="margin-right: 12px;">{{
+              statisticsData.todayBill
+            }}</span>
+          </p>
+        </div>
+      </el-col>
+    </el-row>
+    <!-- 工具栏、表格 -->
+    <el-row :gutter="20">
+      <!-- 工具栏 -->
+      <div class="head-container">
+        <!-- 左侧添加账号、批量禁用 -->
+        <crudOperation show="" :permission="permission" :is-show="true">
+          <template v-slot:right>
+            <!-- <el-button
+              class="filter-item"
+              size="mini"
+              type="primary"
+              @click="batchActivation"
+              >批量设置</el-button
+            > -->
+          </template>
+        </crudOperation>
+        <!-- 右侧搜索、筛选 -->
+        <div v-if="crud.props.searchToggle">
+          <!-- 搜索 -->
+          <el-input
+            v-model="query.channelName"
+            clearable
+            size="small"
+            placeholder="请输入代理商名称"
+            style="width: 200px;"
+            class="filter-item"
+            @keyup.enter.native="crud.toQuery"
+          />
+          <rrOperation />
+        </div>
+      </div>
+      <!-- 表格 -->
+      <el-table
+        ref="tables"
+        v-loading="crud.loading"
+        :data="crud.data"
+        style="width: 100%;margin-bottom: 20px;"
+        :header-cell-style="{ 'text-align': 'left' }"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="channelName"
+          label="名称"
+        />
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="totalNum"
+          label="资源总分配量"
+          sortable
+          width="120"
+        />
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="surplusNum"
+          label="资源兑换余量"
+          sortable
+          width="120"
+        />
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="totalPhoneBill"
+          label="话费总分配量"
+          sortable
+          width="120"
+        />
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="surplusPhoneBill"
+          label="话费兑换余量"
+          sortable
+          width="120"
+        />
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="purchaseTime"
+          label="最近购包时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.purchaseTime ? parseTime(scope.row.purchaseTime) : "——"
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="createTime"
+          label="创建时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.createTime ? parseTime(scope.row.createTime) : "——"
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="100">
+          <template slot-scope="scope">
+            <div style="display: flex;align-items: center;">
+              <el-button
+                slot="reference"
+                class="popover-item"
+                type="text"
+                @click="allotmentQuantity(scope.row)"
+              >
+                配量
+              </el-button>
+              <!-- <span style="color: #d7d7d7;margin:0 5px;">|</span> -->
+              <el-button
+                slot="reference"
+                class="popover-item"
+                type="text"
+                @click="detail(scope.row)"
+              >
+                详情</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </el-row>
+    <!-- 配量设置弹出框 -->
+    <el-dialog
+      append-to-body
+      :close-on-click-modal="false"
+      :visible.sync="allotmentQuantityDialogVisible"
+      title="配量设置"
+      width="570px"
+      @close="allotmentQuantityDialogClose"
+    >
+      <el-form
+        ref="allotmentQuantityFormRef"
+        :inline="true"
+        :model="channelCustom"
+        size="small"
+        label-width="100px"
+      >
+        <el-form-item label="代理商名称: " style="width:330px">
+          <span>{{ channelCustom.channelName }}</span>
+        </el-form-item>
+        <el-form-item label="分配数量: ">
+          <el-input-number
+            ref="refNumber"
+            v-model="channelCustom.assignNum"
+            controls-position="right"
+            :min="0"
+            @input.native="eventDisposalRangeChange()"
+          />
+          <span style="margin-left: 10px;">个</span>
+        </el-form-item>
+        <el-form-item label="分配话费: ">
+          <el-input-number
+            ref="refNumber"
+            v-model="channelCustom.assignBill"
+            controls-position="right"
+            :min="0"
+            @input.native="eventDisposalRangeChange()"
+          />
+          <span style="margin-left: 10px;">分钟</span>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          :loading="allotmentQuantityDialogSubmitLoading"
+          type="primary"
+          @click="allotmentQuantitySubmit"
+        >提交</el-button>
+        <el-button
+          type="text"
+          @click="allotmentQuantityDialogClose"
+        >取消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 详情弹出框 -->
+    <el-dialog
+      append-to-body
+      :close-on-click-modal="false"
+      :visible.sync="detailDialogVisible"
+      title="详情"
+      width="630px"
+      @close="detailDialogClose"
+    >
+      <p class="dialogTitle" style="margin-bottom: 20px;">
+        代理商: {{ channelCustom.channelName }}
+      </p>
+      <p class="dialogTitle" style="margin-bottom: 20px;">分配记录</p>
+      <div style="margin-bottom: 40px;">
+        <span class="dialogTitle">选择日期: </span>
+        <date-range-picker
+          v-model="createTime"
+          class="date-item"
+          @change="dateRangePickerChange"
+        />
+      </div>
+      <el-table
+        ref="tables"
+        v-loading="pictLoading"
+        :data="detailList"
+        style="width: 100%;margin-bottom: 20px;"
+        :header-cell-style="{ 'text-align': 'left' }"
+      >
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="createTime"
+          label="分配时间"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.createTime ? parseTime(scope.row.createTime) : "——"
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="assignNum"
+          label="分配数目"
+        />
+        <el-table-column
+          :show-overflow-tooltip="true"
+          prop="assignName"
+          label="分配人员"
+        />
+      </el-table>
+      <!--详情弹出框中的分页-->
+      <!-- <el-pagination
+        background
+        :page-size="size"
+        :page-sizes="pageSizes"
+        :total="total"
+        :current-page="page"
+        style="margin-top: 8px;"
+        layout="total, prev, pager, next, sizes"
+        @size-change="sizeChange"
+        @current-change="currentChange"
+      /> -->
+      <!-- 分页 -->
+      <el-pagination
+        background
+        :page-size="size"
+        :total="total"
+        :page-sizes="pageSizes"
+        :current-page="page"
+        style="margin-top: 8px;"
+        layout="total, prev, pager, next, sizes"
+        @size-change="sizeChange"
+        @current-change="currentChange"
+      />
+      <!-- <pagination /> -->
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import crudUser from '@/api/system/user'
+// import { isvalidPhone } from '@/utils/validate'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker'
+import { mapGetters } from 'vuex'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import {
+  allotmentQuantity,
+  allocationRecord,
+  statistics
+} from '@/api/resourceBundleManagement/index'
+// import { parseTime } from '@/utils/index'
+const defaultForm = {
+  id: null,
+  username: null,
+  nickName: null,
+  gender: '渠道商账号',
+  email: null,
+  enabled: 'false',
+  turnCrmNum: 50,
+  roles: [],
+  jobs: [],
+  dept: { id: null },
+  phone: null
+}
+export default {
+  name: 'User',
+  components: {
+    crudOperation,
+    rrOperation,
+    pagination,
+    DateRangePicker
+  },
+  cruds() {
+    return CRUD({
+      // title: "配量设置",
+      url: '/api-management/api/resource/queryAll',
+      crudMethod: { ...crudUser },
+      optShow: {}
+      // params: { page: 0, sort: 0 }
+      // props: { dowmapi: "api-management/api/users" }
+    })
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  data() {
+    // 自定义验证
+    // const validPhone = (rule, value, callback) => {
+    //   if (!value) {
+    //     callback(new Error('请输入电话号码'))
+    //   } else if (!isvalidPhone(value)) {
+    //     callback(new Error('请输入正确的11位手机号码'))
+    //   } else {
+    //     callback()
+    //   }
+    // }
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
+      permission: {
+        add: ['admin', 'user:add'],
+        edit: ['admin', 'user:edit'],
+        del: ['admin', 'user:del'],
+        download: ['admin', 'user:download'],
+        more: true,
+        // recharge: true,
+        delUser: true
+      },
+      // 统计数据
+      statisticsData: {},
+      // 配量表单数据
+      channelCustom: {
+        channelName: '',
+        assignNum: 0,
+        assignBill: 0,
+        channelld: ''
+      },
+      // 配量设置弹出框确认Loading
+      allotmentQuantityDialogSubmitLoading: false,
+      // 配量设置弹出框控制显隐
+      allotmentQuantityDialogVisible: false,
+      // 详情弹出框控制显隐
+      detailDialogVisible: false,
+      // 详情表格数据
+      // detailList: [],
+      // 渠道商id
+      channelMerchantId: '',
+      // 时间选择器
+      createTime: [],
+      // 分页
+      page: 1, // 第几页
+      size: 10, // 一页多少条
+      total: 0, // 总条目数
+      pageSizes: [10, 20, 30, 40, 50, 100], // 可选择的一页多少条
+      detailList: [], // 表格绑定的数据
+      allData: [],
+      // 控制loading
+      pictLoading: false
+    }
+  },
+
+  computed: {
+    ...mapGetters(['user'])
+  },
+  created() {
+    this.crud.msg.add = '新增成功，默认密码：123456'
+    this.getStatisticsData()
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  methods: {
+    // 获取统计数据
+    async getStatisticsData() {
+      const res = await statistics()
+      if (res.status === 0) {
+        this.statisticsData = res.data
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 批量设置
+    // async batchActivation() {
+    //   const res = await activateAndActivate(this.ids);
+    //   if (res.status === 0) {
+    //     this.$message.success("操作成功");
+    //     this.crud.toQuery();
+    //   } else {
+    //     this.$message.error(res.msg);
+    //   }
+    //   console.log(res, "res");
+    // },
+    // 打开配量弹出框
+    allotmentQuantity(data) {
+      this.allotmentQuantityDialogVisible = true
+      this.channelCustom.channelName = data.channelName
+      this.channelMerchantId = data.id
+    },
+    // 计数器
+    eventDisposalRangeChange(val) {
+      console.log(val, 'val')
+      const key = this.$refs.refNumber.displayValue
+      this.num = String(key).replace(/[^\d]/g, '')
+      // console.log(this.$refs.num("num"), ' this.$refs.num("num")');
+      // if (val !== undefined) {
+      //   this.$refs.num("num");
+      // }
+    },
+    // 配量设置弹出框关闭
+    allotmentQuantityDialogClose() {
+      this.allotmentQuantityDialogVisible = false
+      this.channelCustom.assignNum = 0
+      this.channelCustom.assignBill = 0
+      // this.$refs["allotmentQuantityFormRef"].clearValidate();
+    },
+    // 配量表单提交
+    allotmentQuantitySubmit() {
+      this.$refs['allotmentQuantityFormRef'].validate(valid => {
+        if (valid) {
+          this.allotmentQuantityDialogSubmitLoading = true
+          allotmentQuantity(
+            this.channelMerchantId,
+            this.channelCustom.assignNum,
+            this.channelCustom.assignBill
+          )
+            .then(res => {
+              this.allotmentQuantityDialogSubmitLoading = false
+              if (res.status === 0) {
+                this.$message.success('操作成功')
+                this.allotmentQuantityDialogClose()
+                this.crud.toQuery()
+                this.getStatisticsData()
+              } else {
+                this.$message.error(res.msg)
+              }
+            })
+            .catch(() => {
+              this.allotmentQuantityDialogSubmitLoading = false
+            })
+        } else {
+          return false
+        }
+      })
+    },
+    // 打开详情弹出框
+    async detail(data) {
+      this.channelMerchantId = data.id
+      this.page = 1
+      this.size = 10
+      this.getActivationCodeForm()
+      // const res = await allocationRecord({
+      //   channelId: data.id,
+      //   page: this.page - 1,
+      //   size: this.size
+      // })
+      // this.detailList = res.content
+      this.detailDialogVisible = true
+      this.channelCustom.channelName = data.channelName
+    },
+    // 详情弹出框关闭
+    detailDialogClose() {
+      this.detailDialogVisible = false
+      this.createTime = []
+      // this.$refs['allotmentQuantityFormRef'].clearValidate()
+    },
+    // 日期选择器change事件
+    async dateRangePickerChange(val) {
+      this.createTime = val
+      const res = await allocationRecord({
+        channelId: this.channelMerchantId,
+        createTime: this.createTime,
+        page: this.page - 1,
+        size: this.size
+      })
+      this.detailList = res.content
+      this.total = res.totalElements
+    },
+    // 获取表格数据
+    async getActivationCodeForm() {
+      this.pictLoading = true
+      await allocationRecord({
+        createTime: this.createTime,
+        channelId: this.channelMerchantId,
+        page: this.page - 1,
+        size: this.size
+      }).then(res => {
+        const data = JSON.parse(JSON.stringify(res))
+        this.detailList = data.content.splice(0, this.size)
+        this.total = data.totalElements
+        this.pictLoading = false
+      }).catch(() => {
+        this.pictLoading = false
+      })
+      // const res = await getActivationCodeForm({
+      //   page: this.page - 1,
+      //   size: this.size
+      // })
+
+      // data.content.forEach(item => {
+      //   const time = parseTime(item.createTime)
+      //   item.createTime = time
+      //   // if (item.codeType == '3') {
+      //   //   item.codeType = '季卡'
+      //   // } else if (item.codeType == '2') {
+      //   //   item.codeType = '年卡'
+      //   // }
+      // })
+    },
+    currentChange(val) {
+      console.log(val, '123')
+      this.page = val
+      this.getActivationCodeForm()
+    },
+    sizeChange(val) {
+      console.log(val, 'val')
+      this.size = val
+      this.page = 1
+      this.getActivationCodeForm()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.head-container {
+  display: flex;
+  align-items: center;
+}
+//监测数量区域
+.detectQuantityArea {
+  font-size: 14px;
+  margin-bottom: 50px;
+}
+//数量名称
+.quantityName {
+  color: #909399;
+}
+//重点数量
+.keyQuantity {
+  font-size: 25px;
+  margin-top: 15px;
+}
+.popover-item {
+  display: block;
+  cursor: pointer;
+  height: 30px;
+  font-size: 13px;
+  text-align: center;
+  span {
+    padding: 0 15px;
+  }
+}
+.popover-item:hover {
+  background: #e8f4ff;
+}
+//弹出框日期label样式
+::v-deep .y-label {
+  vertical-align: unset;
+  min-width: unset;
+}
+.el-pagination {
+  text-align: right;
+}
+</style>
diff --git a/src/views/system/distributor/index.vue b/src/views/system/distributor/index.vue
index 2678913..6a9ff4c 100644
--- a/src/views/system/distributor/index.vue
+++ b/src/views/system/distributor/index.vue
@@ -1,293 +1,293 @@
-<!--
- * @Description:
- * @Autor: 飘泊客
- * @Date: 2022-04-19 15:52:12
- * @LastEditors: 飘泊客
- * @LastEditTime: 2023-05-06 14:25:58
--->
-<template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--工具栏-->
-      <div class="head-container">
-        <div v-if="crud.props.searchToggle">
-          <!-- 搜索 -->
-          <el-input
-            v-model="query.phone"
-            clearable
-            size="small"
-            placeholder="输入手机号码搜索"
-            style="width: 200px;"
-            class="filter-item"
-            @keyup.enter.native="crud.toQuery"
-          />
-          <!-- <date-range-picker v-model="query.createTime" class="date-item" /> -->
-          <!-- <el-select
-            v-model="query.enabled"
-            clearable
-            size="small"
-            placeholder="状态"
-            class="filter-item"
-            style="width: 90px"
-            @change="crud.toQuery"
-          >
-            <el-option
-              v-for="item in enabledTypeOptions"
-              :key="item.key"
-              :label="item.display_name"
-              :value="item.key"
-            />
-          </el-select> -->
-          <rrOperation />
-        </div>
-        <!-- <crudOperation show="" :permission="permission" @onRechargeArr="onRecharges">
-          <template v-slot:right>
-            <div class="rig-btn filter-item">
-              <el-upload
-                class="upload-demo"
-                :action="importUsers"
-                :show-file-list="false"
-                :headers="headers"
-                accept=".xlsx,.xls"
-                multiple
-                :limit="1"
-                :on-success="onsucess"
-                :on-error="onerror"
-              >
-                <el-button size="mini" type="primary">批量上传</el-button>
-              </el-upload>
-              <el-link type="primary" :underline="false" @click="downLink">(模板下载)</el-link>
-            </div>
-          </template>
-        </crudOperation> -->
-      </div>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" :header-cell-style="{'text-align':'left'}" @selection-change="crud.selectionChangeHandler">
-        <el-table-column :show-overflow-tooltip="true" prop="phone" label="用户名" />
-        <el-table-column prop="invitationNums" label="邀请数量" width="80" />
-        <el-table-column :show-overflow-tooltip="true" width="135" prop="qrCodePath" label="分销二维码">
-          <template slot-scope="scope">
-            <el-image
-              style="width: 100px; height: 100px"
-              :src=" baseImgUrl + scope.row.qrCodePath"
-              fit="contain"
-              :preview-src-list="previewImg(baseImgUrl + scope.row.qrCodePath)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column label="状态" align="center" width="100" prop="status">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.status"
-              :disabled="user.id === scope.row.id"
-              active-color="#409EFF"
-              inactive-color="#F56C6C"
-              @change="changeEnabled(scope.row, scope.row.status)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="lastLoginTime" label="最后登录时间">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.lastLoginTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-permission="['admin','user:edit','user:del']"
-          label="操作"
-          width="140"
-          fixed="right"
-        >
-          <template slot-scope="scope">
-            <el-button slot="reference" type="primary" size="mini" @click="openDetail(scope.row.id)">详情</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </el-row>
-    <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="recordProp" title="分销人员" width="850px">
-      <!-- <div class="mb-10">
-        <date-range-picker v-model="childrenQuery.createTime" class="date-item" />
-        <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      </div> -->
-      <el-table ref="table" v-loading="detail.loading" :data="detail.data" :header-cell-style="{'text-align':'left'}" style="width: 100%;">
-        <el-table-column :show-overflow-tooltip="true" prop="name" label="姓名" width="80" />
-        <el-table-column prop="nid" label="电话" width="120" />
-        <el-table-column :show-overflow-tooltip="true" prop="debtType" label="债务类别">
-          <template slot-scope="scope">
-            <span>{{ (scope.row.debtType == 0 ? '信用卡' : scope.row.debtType == 1 ? '网贷' : '信用卡+网贷') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="quota" label="额度">
-          <template slot-scope="scope">
-            <span>{{ (scope.row.quota == 0 ? '5-10万' : scope.row.quota == 1 ? '10-20万' : scope.row.quota == 2 ? '20-30万' : scope.row.quota == 3 ? '30-50万' : '50万以上') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <el-pagination
-        :page-size.sync="page.size"
-        :total="page.total"
-        :current-page.sync="page.page"
-        style="margin-top: 8px;"
-        layout="total, prev, pager, next"
-        @current-change="pageChangeHandler"
-      />
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="recordProp = false">关闭</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import crudUser from '@/api/system/user'
-import { getToken } from '@/utils/auth'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import { mapGetters } from 'vuex'
-import { updateUserStatus, debtqueryAll } from '@/api/index'
-const defaultForm = { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 'false', roles: [], jobs: [], dept: { id: null }, phone: null }
-// 分销商
-export default {
-  name: 'Distributor',
-  components: { rrOperation, pagination },
-  cruds() {
-    return CRUD({ title: '分销商', url: 'api-management/api/form/user/queryAll', crudMethod: { ...crudUser }})
-  },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  // 数据字典
-  dicts: ['user_status'],
-  data() {
-    return {
-      height: document.documentElement.clientHeight - 180 + 'px;',
-      deptName: '', depts: [], deptDatas: [], jobs: [], level: 3, roles: [],
-      jobDatas: [], roleDatas: '', // 多选时使用
-      defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
-      permission: {
-        add: ['admin', 'user:add'],
-        edit: ['admin', 'user:edit'],
-        del: ['admin', 'user:del'],
-        download: ['admin', 'user:download'],
-        copy: true,
-        more: true,
-        recharge: true
-      },
-      enabledTypeOptions: [
-        { key: 'true', display_name: '激活' },
-        { key: 'false', display_name: '锁定' }
-      ],
-      headers: {
-        Authorization: 'Bearer ' + getToken()
-      },
-      page: {
-        page: 1,
-        size: 10,
-        total: 0
-      },
-      childrenQuery: {
-        createTime: ''
-      },
-      detail: {
-        data: [],
-        loading: false
-      },
-      recordProp: false,
-      detailId: null // 二级操作id
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'user',
-      'importUsers',
-      'baseImgUrl'
-    ])
-  },
-  created() {},
-  mounted: function() {
-    const that = this
-    window.onresize = function temp() {
-      that.height = document.documentElement.clientHeight - 180 + 'px;'
-    }
-    setTimeout(() => {
-      console.log(this.crud.data)
-    }, 6000)
-  },
-  methods: {
-    // 改变状态
-    changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.phone + ', 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        updateUserStatus({ status: data.status, id: data.id }).then(res => {
-          this.crud.notify(this.dict.label.user_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          data.status = !data.status
-        })
-      }).catch(() => {
-        data.status = !data.status
-      })
-    },
-    // 预览图片
-    previewImg(img) {
-      return [img]
-    },
-    // 修改页码
-    pageChangeHandler(option) {
-      this.page.page = option
-      this.searchDetail()
-    },
-    openDetail(id) {
-      this.detailId = id
-      this.page.page = 1
-      this.searchDetail()
-    },
-    // 搜索
-    toQuery() {
-      this.page.page = 1
-      this.searchDetail()
-    },
-    searchDetail() {
-      this.detail.loading = true
-      this.recordProp = true
-      debtqueryAll({ userId: this.detailId, createTime: this.childrenQuery.createTime, page: this.page.page - 1, size: this.page.size }).then(res => {
-        this.page.total = res.totalElements
-        this.detail.data = res.content
-        this.detail.loading = false
-      }).catch(() => {
-        this.detail.loading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
-    height: 30px;
-    line-height: 30px;
-  }
-  .rig-btn {
-    width: 180px;
-    display: flex!important;
-  }
-  .upload-demo {
-    margin-left: 7px;
-  }
-  .head-container ::v-deep .crud-opts-left {
-    display: inherit!important;
-  }
-</style>
+<!--
+ * @Description:
+ * @Autor: 飘泊客
+ * @Date: 2022-04-19 15:52:12
+ * @LastEditors: 飘泊客
+ * @LastEditTime: 2023-05-06 14:25:58
+-->
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--工具栏-->
+      <div class="head-container">
+        <div v-if="crud.props.searchToggle">
+          <!-- 搜索 -->
+          <el-input
+            v-model="query.phone"
+            clearable
+            size="small"
+            placeholder="输入手机号码搜索"
+            style="width: 200px;"
+            class="filter-item"
+            @keyup.enter.native="crud.toQuery"
+          />
+          <!-- <date-range-picker v-model="query.createTime" class="date-item" /> -->
+          <!-- <el-select
+            v-model="query.enabled"
+            clearable
+            size="small"
+            placeholder="状态"
+            class="filter-item"
+            style="width: 90px"
+            @change="crud.toQuery"
+          >
+            <el-option
+              v-for="item in enabledTypeOptions"
+              :key="item.key"
+              :label="item.display_name"
+              :value="item.key"
+            />
+          </el-select> -->
+          <rrOperation />
+        </div>
+        <!-- <crudOperation show="" :permission="permission" @onRechargeArr="onRecharges">
+          <template v-slot:right>
+            <div class="rig-btn filter-item">
+              <el-upload
+                class="upload-demo"
+                :action="importUsers"
+                :show-file-list="false"
+                :headers="headers"
+                accept=".xlsx,.xls"
+                multiple
+                :limit="1"
+                :on-success="onsucess"
+                :on-error="onerror"
+              >
+                <el-button size="mini" type="primary">批量上传</el-button>
+              </el-upload>
+              <el-link type="primary" :underline="false" @click="downLink">(模板下载)</el-link>
+            </div>
+          </template>
+        </crudOperation> -->
+      </div>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" :header-cell-style="{'text-align':'left'}" @selection-change="crud.selectionChangeHandler">
+        <el-table-column :show-overflow-tooltip="true" prop="phone" label="用户名" />
+        <el-table-column prop="invitationNums" label="邀请数量" width="80" />
+        <el-table-column :show-overflow-tooltip="true" width="135" prop="qrCodePath" label="分销二维码">
+          <template slot-scope="scope">
+            <el-image
+              style="width: 100px; height: 100px"
+              :src=" baseImgUrl + scope.row.qrCodePath"
+              fit="contain"
+              :preview-src-list="previewImg(baseImgUrl + scope.row.qrCodePath)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" width="100" prop="status">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.status"
+              :disabled="user.id === scope.row.id"
+              active-color="#409EFF"
+              inactive-color="#F56C6C"
+              @change="changeEnabled(scope.row, scope.row.status)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="lastLoginTime" label="最后登录时间">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.lastLoginTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-permission="['admin','user:edit','user:del']"
+          label="操作"
+          width="75"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-button slot="reference" type="primary" size="mini" @click="openDetail(scope.row.id)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </el-row>
+    <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="recordProp" title="分销人员" width="850px">
+      <!-- <div class="mb-10">
+        <date-range-picker v-model="childrenQuery.createTime" class="date-item" />
+        <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      </div> -->
+      <el-table ref="table" v-loading="detail.loading" :data="detail.data" :header-cell-style="{'text-align':'left'}" style="width: 100%;">
+        <el-table-column :show-overflow-tooltip="true" prop="name" label="姓名" width="80" />
+        <el-table-column prop="nid" label="电话" width="120" />
+        <el-table-column :show-overflow-tooltip="true" prop="debtType" label="债务类别">
+          <template slot-scope="scope">
+            <span>{{ (scope.row.debtType == 0 ? '信用卡' : scope.row.debtType == 1 ? '网贷' : '信用卡+网贷') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="quota" label="额度">
+          <template slot-scope="scope">
+            <span>{{ (scope.row.quota == 0 ? '5-10万' : scope.row.quota == 1 ? '10-20万' : scope.row.quota == 2 ? '20-30万' : scope.row.quota == 3 ? '30-50万' : '50万以上') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <el-pagination
+        :page-size.sync="page.size"
+        :total="page.total"
+        :current-page.sync="page.page"
+        style="margin-top: 8px;"
+        layout="total, prev, pager, next"
+        @current-change="pageChangeHandler"
+      />
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="recordProp = false">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import crudUser from '@/api/system/user'
+import { getToken } from '@/utils/auth'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import { mapGetters } from 'vuex'
+import { updateUserStatus, debtqueryAll } from '@/api/index'
+const defaultForm = { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 'false', roles: [], jobs: [], dept: { id: null }, phone: null }
+// 分销商
+export default {
+  name: 'Distributor',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '分销商', url: 'api-management/api/form/user/queryAll', crudMethod: { ...crudUser }})
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  // 数据字典
+  dicts: ['user_status'],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      deptName: '', depts: [], deptDatas: [], jobs: [], level: 3, roles: [],
+      jobDatas: [], roleDatas: '', // 多选时使用
+      defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
+      permission: {
+        add: ['admin', 'user:add'],
+        edit: ['admin', 'user:edit'],
+        del: ['admin', 'user:del'],
+        download: ['admin', 'user:download'],
+        copy: true,
+        more: true,
+        recharge: true
+      },
+      enabledTypeOptions: [
+        { key: 'true', display_name: '激活' },
+        { key: 'false', display_name: '锁定' }
+      ],
+      headers: {
+        Authorization: 'Bearer ' + getToken()
+      },
+      page: {
+        page: 1,
+        size: 10,
+        total: 0
+      },
+      childrenQuery: {
+        createTime: ''
+      },
+      detail: {
+        data: [],
+        loading: false
+      },
+      recordProp: false,
+      detailId: null // 二级操作id
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'user',
+      'importUsers',
+      'baseImgUrl'
+    ])
+  },
+  created() {},
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+    setTimeout(() => {
+      console.log(this.crud.data)
+    }, 6000)
+  },
+  methods: {
+    // 改变状态
+    changeEnabled(data, val) {
+      this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.phone + ', 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        updateUserStatus({ status: data.status, id: data.id }).then(res => {
+          this.crud.notify(this.dict.label.user_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        }).catch(() => {
+          data.status = !data.status
+        })
+      }).catch(() => {
+        data.status = !data.status
+      })
+    },
+    // 预览图片
+    previewImg(img) {
+      return [img]
+    },
+    // 修改页码
+    pageChangeHandler(option) {
+      this.page.page = option
+      this.searchDetail()
+    },
+    openDetail(id) {
+      this.detailId = id
+      this.page.page = 1
+      this.searchDetail()
+    },
+    // 搜索
+    toQuery() {
+      this.page.page = 1
+      this.searchDetail()
+    },
+    searchDetail() {
+      this.detail.loading = true
+      this.recordProp = true
+      debtqueryAll({ userId: this.detailId, createTime: this.childrenQuery.createTime, page: this.page.page - 1, size: this.page.size }).then(res => {
+        this.page.total = res.totalElements
+        this.detail.data = res.content
+        this.detail.loading = false
+      }).catch(() => {
+        this.detail.loading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
+    height: 30px;
+    line-height: 30px;
+  }
+  .rig-btn {
+    width: 180px;
+    display: flex!important;
+  }
+  .upload-demo {
+    margin-left: 7px;
+  }
+  .head-container ::v-deep .crud-opts-left {
+    display: inherit!important;
+  }
+</style>
diff --git a/src/views/system/down/currentDownload.vue b/src/views/system/down/currentDownload.vue
index 6a8ab38..a2fb81e 100644
--- a/src/views/system/down/currentDownload.vue
+++ b/src/views/system/down/currentDownload.vue
@@ -41,14 +41,14 @@
         </el-table-column> -->
         <el-table-column
           label="操作"
-          width="300"
+          width="160"
           align="center"
           fixed="right"
         >
           <template slot-scope="scope">
-            <el-button v-if="scope.row.type === 1 && scope.row.clueNum >= 100" @click="sendEmail(scope.row.id)">发送邮件</el-button>
-            <el-button v-if="scope.row.status === 1" type="primary" @click="downloadUrl('email', scope.row)">下载邮件</el-button>
-            <el-button v-if="scope.row.type === 2 || (scope.row.type === 1 && scope.row.clueNum < 100)" type="success" @click="downloadUrl('excel', scope.row)">下载excel</el-button>
+            <el-button v-if="scope.row.type === 1 && scope.row.clueNum >= 100" type="text" @click="sendEmail(scope.row.id)">发送邮件</el-button>
+            <el-button v-if="scope.row.status === 1" type="text" @click="downloadUrl('email', scope.row)">下载邮件</el-button>
+            <el-button v-if="scope.row.type === 2 || (scope.row.type === 1 && scope.row.clueNum < 100)" type="text" @click="downloadUrl('excel', scope.row)">下载excel</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/system/down/tripartiteDownload.vue b/src/views/system/down/tripartiteDownload.vue
index 777a518..83823f7 100644
--- a/src/views/system/down/tripartiteDownload.vue
+++ b/src/views/system/down/tripartiteDownload.vue
@@ -34,12 +34,10 @@
         </el-table-column> -->
         <el-table-column
           label="操作"
-          width="140"
-          align="center"
-          fixed="right"
+          width="100"
         >
           <template slot-scope="scope">
-            <el-button v-if="scope.row.status === 1" type="primary" @click="downloadUrl('email', scope.row)">下载文件</el-button>
+            <el-button v-if="scope.row.status === 1" type="text" @click="downloadUrl('email', scope.row)">下载文件</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 2669e7f..73dc3d2 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -267,8 +267,7 @@
       <el-table-column
         v-if="checkPer(['admin', 'menu:edit', 'menu:del'])"
         label="操作"
-        width="130px"
-        align="center"
+        width="100px"
         fixed="right"
       >
         <template slot-scope="scope">
diff --git a/src/views/system/rechargeRecord/index.vue b/src/views/system/rechargeRecord/index.vue
index f7c6876..56738f7 100644
--- a/src/views/system/rechargeRecord/index.vue
+++ b/src/views/system/rechargeRecord/index.vue
@@ -98,8 +98,8 @@
           </template>
         </el-table-column> -->
         <el-table-column
-          :show-overflow-tooltip="true"
           prop="amount"
+          width="100"
           label="详情"
         >
           <template slot-scope="scope">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index c9cc745..1695b1d 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,360 +1,360 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <el-input v-model="query.blurry" size="small" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
-        <date-range-picker v-model="query.createTime" class="date-item" />
-        <rrOperation />
-      </div>
-      <crudOperation :permission="permission" />
-    </div>
-    <!-- 表单渲染 -->
-    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
-      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
-        <el-form-item label="角色名称" prop="name">
-          <el-input v-model="form.name" style="width: 380px;" />
-        </el-form-item>
-        <el-form-item label="角色级别" prop="level">
-          <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 145px;" />
-        </el-form-item>
-        <el-form-item label="数据范围" prop="dataScope">
-          <el-select v-model="form.dataScope" style="width: 140px" placeholder="请选择数据范围" @change="changeScope">
-            <el-option
-              v-for="item in dateScopes"
-              :key="item"
-              :label="item"
-              :value="item"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="form.dataScope === '自定义'" label="数据权限" prop="depts">
-          <treeselect
-            v-model="deptDatas"
-            :load-options="loadDepts"
-            :options="depts"
-            multiple
-            style="width: 380px"
-            placeholder="请选择"
-          />
-        </el-form-item>
-        <el-form-item label="描述信息" prop="description">
-          <el-input v-model="form.description" style="width: 380px;" rows="5" type="textarea" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="crud.cancelCU">取消</el-button>
-        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-      </div>
-    </el-dialog>
-    <el-row :gutter="15">
-      <!--角色管理-->
-      <el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="17" style="margin-bottom: 10px">
-        <el-card class="box-card" shadow="never">
-          <div slot="header" class="clearfix">
-            <span class="role-span">角色列表</span>
-          </div>
-          <el-table ref="table" v-loading="crud.loading" highlight-current-row style="width: 100%;" :data="crud.data" :header-cell-style="{'text-align':'left'}" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
-            <el-table-column :selectable="checkboxT" type="selection" width="55" />
-            <el-table-column prop="name" label="名称" />
-            <el-table-column prop="dataScope" label="数据权限" />
-            <el-table-column prop="level" label="角色级别" />
-            <el-table-column :show-overflow-tooltip="true" prop="description" label="描述" />
-            <el-table-column :show-overflow-tooltip="true" width="135px" prop="createTime" label="创建日期" />
-            <el-table-column v-if="checkPer(['admin','roles:edit','roles:del'])" label="操作" width="130px" align="center" fixed="right">
-              <template slot-scope="scope">
-                <udOperation
-                  v-if="scope.row.level >= level"
-                  :data="scope.row"
-                  :permission="permission"
-                />
-              </template>
-            </el-table-column>
-          </el-table>
-          <!--分页组件-->
-          <pagination />
-        </el-card>
-      </el-col>
-      <!-- 菜单授权 -->
-      <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="7">
-        <el-card class="box-card" shadow="never">
-          <div slot="header" class="clearfix">
-            <el-tooltip class="item" effect="dark" content="选择指定角色分配菜单" placement="top">
-              <span class="role-span">菜单分配</span>
-            </el-tooltip>
-            <el-button
-              v-permission="['admin','roles:edit']"
-              :disabled="!showButton"
-              :loading="menuLoading"
-              icon="el-icon-check"
-              size="mini"
-              style="float: right; padding: 6px 9px"
-              type="primary"
-              @click="saveMenu"
-            >保存</el-button>
-          </div>
-          <el-tree
-            ref="menu"
-            lazy
-            :data="menus"
-            :default-checked-keys="menuIds"
-            :load="getMenuDatas"
-            :props="defaultProps"
-            check-strictly
-            accordion
-            show-checkbox
-            node-key="id"
-            @check="menuChange"
-          />
-        </el-card>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import crudRoles from '@/api/system/role'
-import { getDepts, getDeptSuperior } from '@/api/system/dept'
-import { getMenusTree, getChild } from '@/api/system/menu'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
-import DateRangePicker from '@/components/DateRangePicker'
-
-const defaultForm = { id: null, name: null, depts: [], description: null, dataScope: '全部', level: 3 }
-export default {
-  name: 'Role',
-  components: { Treeselect, pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
-  cruds() {
-    return CRUD({ title: '角色', url: 'api-management/api/roles', sort: 'level,asc', crudMethod: { ...crudRoles }})
-  },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  data() {
-    return {
-      defaultProps: { children: 'children', label: 'label', isLeaf: 'leaf' },
-      dateScopes: ['全部', '本级', '自定义'], level: 3,
-      currentId: 0, menuLoading: false, showButton: false,
-      menus: [], menuIds: [], depts: [], deptDatas: [], // 多选时使用
-      permission: {
-        add: ['admin', 'roles:add'],
-        edit: ['admin', 'roles:edit'],
-        del: ['admin', 'roles:del']
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ],
-        permission: [
-          { required: true, message: '请输入权限', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-    crudRoles.getLevel().then(data => {
-      this.level = data.level
-    })
-  },
-  methods: {
-    getMenuDatas(node, resolve) {
-      setTimeout(() => {
-        getMenusTree(node.data.id ? node.data.id : 0).then(res => {
-          resolve(res)
-        })
-      }, 100)
-    },
-    [CRUD.HOOK.afterRefresh]() {
-      this.$refs.menu.setCheckedKeys([])
-    },
-    // 新增前初始化部门信息
-    [CRUD.HOOK.beforeToAdd](crud, form) {
-      this.deptDatas = []
-      form.menus = null
-    },
-    // 编辑前初始化自定义数据权限的部门信息
-    [CRUD.HOOK.beforeToEdit](crud, form) {
-      this.deptDatas = []
-      if (form.dataScope === '自定义') {
-        this.getSupDepts(form.depts)
-      }
-      const _this = this
-      form.depts.forEach(function(dept) {
-        _this.deptDatas.push(dept.id)
-      })
-      // 将角色的菜单清空，避免日志入库数据过长
-      form.menus = null
-    },
-    // 提交前做的操作
-    [CRUD.HOOK.afterValidateCU](crud) {
-      if (crud.form.dataScope === '自定义' && this.deptDatas.length === 0) {
-        this.$message({
-          message: '自定义数据权限不能为空',
-          type: 'warning'
-        })
-        return false
-      } else if (crud.form.dataScope === '自定义') {
-        const depts = []
-        this.deptDatas.forEach(function(data) {
-          const dept = { id: data }
-          depts.push(dept)
-        })
-        crud.form.depts = depts
-      } else {
-        crud.form.depts = []
-      }
-      return true
-    },
-    // 触发单选
-    handleCurrentChange(val) {
-      if (val) {
-        const _this = this
-        // 清空菜单的选中
-        this.$refs.menu.setCheckedKeys([])
-        // 保存当前的角色id
-        this.currentId = val.id
-        // 初始化默认选中的key
-        this.menuIds = []
-        val.menus.forEach(function(data) {
-          _this.menuIds.push(data.id)
-        })
-        this.showButton = true
-      }
-    },
-    menuChange(menu) {
-      // 获取该节点的所有子节点，id 包含自身
-      getChild(menu.id).then(childIds => {
-        // 判断是否在 menuIds 中，如果存在则删除，否则添加
-        if (this.menuIds.indexOf(menu.id) !== -1) {
-          for (let i = 0; i < childIds.length; i++) {
-            const index = this.menuIds.indexOf(childIds[i])
-            if (index !== -1) {
-              this.menuIds.splice(index, 1)
-            }
-          }
-        } else {
-          for (let i = 0; i < childIds.length; i++) {
-            const index = this.menuIds.indexOf(childIds[i])
-            if (index === -1) {
-              this.menuIds.push(childIds[i])
-            }
-          }
-        }
-        this.$refs.menu.setCheckedKeys(this.menuIds)
-      })
-    },
-    // 保存菜单
-    saveMenu() {
-      this.menuLoading = true
-      const role = { id: this.currentId, menus: [] }
-      // 得到已选中的 key 值
-      this.menuIds.forEach(function(id) {
-        const menu = { id: id }
-        role.menus.push(menu)
-      })
-      crudRoles.editMenu(role).then(() => {
-        this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.menuLoading = false
-        this.update()
-      }).catch(err => {
-        this.menuLoading = false
-        console.log(err.response.data.message)
-      })
-    },
-    // 改变数据
-    update() {
-      // 无刷新更新 表格数据
-      crudRoles.get(this.currentId).then(res => {
-        for (let i = 0; i < this.crud.data.length; i++) {
-          if (res.id === this.crud.data[i].id) {
-            this.crud.data[i] = res
-            break
-          }
-        }
-      })
-    },
-    // 获取部门数据
-    getDepts() {
-      getDepts({ enabled: true }).then(res => {
-        this.depts = res.content.map(function(obj) {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    getSupDepts(depts) {
-      const ids = []
-      depts.forEach(dept => {
-        ids.push(dept.id)
-      })
-      getDeptSuperior(ids).then(res => {
-        const date = res.content
-        this.buildDepts(date)
-        this.depts = date
-      })
-    },
-    buildDepts(depts) {
-      depts.forEach(data => {
-        if (data.children) {
-          this.buildDepts(data.children)
-        }
-        if (data.hasChildren && !data.children) {
-          data.children = null
-        }
-      })
-    },
-    // 获取弹窗内部门数据
-    loadDepts({ action, parentNode, callback }) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        getDepts({ enabled: true, pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 200)
-        })
-      }
-    },
-    // 如果数据权限为自定义则获取部门数据
-    changeScope() {
-      if (this.form.dataScope === '自定义') {
-        this.getDepts()
-      }
-    },
-    checkboxT(row) {
-      return row.level >= this.level
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-  .role-span {
-    font-weight: bold;color: #303133;
-    font-size: 15px;
-  }
-</style>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
- ::v-deep .el-input-number .el-input__inner {
-    text-align: left;
-  }
- ::v-deep .vue-treeselect__multi-value{
-    margin-bottom: 0;
-  }
- ::v-deep .vue-treeselect__multi-value-item{
-    border: 0;
-    padding: 0;
-  }
-</style>
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.blurry" size="small" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <date-range-picker v-model="query.createTime" class="date-item" />
+        <rrOperation />
+      </div>
+      <crudOperation :permission="permission" />
+    </div>
+    <!-- 表单渲染 -->
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item label="角色名称" prop="name">
+          <el-input v-model="form.name" style="width: 380px;" />
+        </el-form-item>
+        <el-form-item label="角色级别" prop="level">
+          <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 145px;" />
+        </el-form-item>
+        <el-form-item label="数据范围" prop="dataScope">
+          <el-select v-model="form.dataScope" style="width: 140px" placeholder="请选择数据范围" @change="changeScope">
+            <el-option
+              v-for="item in dateScopes"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.dataScope === '自定义'" label="数据权限" prop="depts">
+          <treeselect
+            v-model="deptDatas"
+            :load-options="loadDepts"
+            :options="depts"
+            multiple
+            style="width: 380px"
+            placeholder="请选择"
+          />
+        </el-form-item>
+        <el-form-item label="描述信息" prop="description">
+          <el-input v-model="form.description" style="width: 380px;" rows="5" type="textarea" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+      </div>
+    </el-dialog>
+    <el-row :gutter="15">
+      <!--角色管理-->
+      <el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="17" style="margin-bottom: 10px">
+        <el-card class="box-card" shadow="never">
+          <div slot="header" class="clearfix">
+            <span class="role-span">角色列表</span>
+          </div>
+          <el-table ref="table" v-loading="crud.loading" highlight-current-row style="width: 100%;" :data="crud.data" :header-cell-style="{'text-align':'left'}" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
+            <el-table-column :selectable="checkboxT" type="selection" width="55" />
+            <el-table-column prop="name" label="名称" />
+            <el-table-column prop="dataScope" label="数据权限" />
+            <el-table-column prop="level" label="角色级别" />
+            <el-table-column :show-overflow-tooltip="true" prop="description" label="描述" />
+            <el-table-column :show-overflow-tooltip="true" width="135px" prop="createTime" label="创建日期" />
+            <el-table-column v-if="checkPer(['admin','roles:edit','roles:del'])" label="操作" width="140px" align="center" fixed="right">
+              <template slot-scope="scope">
+                <udOperation
+                  v-if="scope.row.level >= level"
+                  :data="scope.row"
+                  :permission="permission"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页组件-->
+          <pagination />
+        </el-card>
+      </el-col>
+      <!-- 菜单授权 -->
+      <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="7">
+        <el-card class="box-card" shadow="never">
+          <div slot="header" class="clearfix">
+            <el-tooltip class="item" effect="dark" content="选择指定角色分配菜单" placement="top">
+              <span class="role-span">菜单分配</span>
+            </el-tooltip>
+            <el-button
+              v-permission="['admin','roles:edit']"
+              :disabled="!showButton"
+              :loading="menuLoading"
+              icon="el-icon-check"
+              size="mini"
+              style="float: right; padding: 6px 9px"
+              type="primary"
+              @click="saveMenu"
+            >保存</el-button>
+          </div>
+          <el-tree
+            ref="menu"
+            lazy
+            :data="menus"
+            :default-checked-keys="menuIds"
+            :load="getMenuDatas"
+            :props="defaultProps"
+            check-strictly
+            accordion
+            show-checkbox
+            node-key="id"
+            @check="menuChange"
+          />
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import crudRoles from '@/api/system/role'
+import { getDepts, getDeptSuperior } from '@/api/system/dept'
+import { getMenusTree, getChild } from '@/api/system/menu'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import DateRangePicker from '@/components/DateRangePicker'
+
+const defaultForm = { id: null, name: null, depts: [], description: null, dataScope: '全部', level: 3 }
+export default {
+  name: 'Role',
+  components: { Treeselect, pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
+  cruds() {
+    return CRUD({ title: '角色', url: 'api-management/api/roles', sort: 'level,asc', crudMethod: { ...crudRoles }})
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      defaultProps: { children: 'children', label: 'label', isLeaf: 'leaf' },
+      dateScopes: ['全部', '本级', '自定义'], level: 3,
+      currentId: 0, menuLoading: false, showButton: false,
+      menus: [], menuIds: [], depts: [], deptDatas: [], // 多选时使用
+      permission: {
+        add: ['admin', 'roles:add'],
+        edit: ['admin', 'roles:edit'],
+        del: ['admin', 'roles:del']
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        permission: [
+          { required: true, message: '请输入权限', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created() {
+    crudRoles.getLevel().then(data => {
+      this.level = data.level
+    })
+  },
+  methods: {
+    getMenuDatas(node, resolve) {
+      setTimeout(() => {
+        getMenusTree(node.data.id ? node.data.id : 0).then(res => {
+          resolve(res)
+        })
+      }, 100)
+    },
+    [CRUD.HOOK.afterRefresh]() {
+      this.$refs.menu.setCheckedKeys([])
+    },
+    // 新增前初始化部门信息
+    [CRUD.HOOK.beforeToAdd](crud, form) {
+      this.deptDatas = []
+      form.menus = null
+    },
+    // 编辑前初始化自定义数据权限的部门信息
+    [CRUD.HOOK.beforeToEdit](crud, form) {
+      this.deptDatas = []
+      if (form.dataScope === '自定义') {
+        this.getSupDepts(form.depts)
+      }
+      const _this = this
+      form.depts.forEach(function(dept) {
+        _this.deptDatas.push(dept.id)
+      })
+      // 将角色的菜单清空，避免日志入库数据过长
+      form.menus = null
+    },
+    // 提交前做的操作
+    [CRUD.HOOK.afterValidateCU](crud) {
+      if (crud.form.dataScope === '自定义' && this.deptDatas.length === 0) {
+        this.$message({
+          message: '自定义数据权限不能为空',
+          type: 'warning'
+        })
+        return false
+      } else if (crud.form.dataScope === '自定义') {
+        const depts = []
+        this.deptDatas.forEach(function(data) {
+          const dept = { id: data }
+          depts.push(dept)
+        })
+        crud.form.depts = depts
+      } else {
+        crud.form.depts = []
+      }
+      return true
+    },
+    // 触发单选
+    handleCurrentChange(val) {
+      if (val) {
+        const _this = this
+        // 清空菜单的选中
+        this.$refs.menu.setCheckedKeys([])
+        // 保存当前的角色id
+        this.currentId = val.id
+        // 初始化默认选中的key
+        this.menuIds = []
+        val.menus.forEach(function(data) {
+          _this.menuIds.push(data.id)
+        })
+        this.showButton = true
+      }
+    },
+    menuChange(menu) {
+      // 获取该节点的所有子节点，id 包含自身
+      getChild(menu.id).then(childIds => {
+        // 判断是否在 menuIds 中，如果存在则删除，否则添加
+        if (this.menuIds.indexOf(menu.id) !== -1) {
+          for (let i = 0; i < childIds.length; i++) {
+            const index = this.menuIds.indexOf(childIds[i])
+            if (index !== -1) {
+              this.menuIds.splice(index, 1)
+            }
+          }
+        } else {
+          for (let i = 0; i < childIds.length; i++) {
+            const index = this.menuIds.indexOf(childIds[i])
+            if (index === -1) {
+              this.menuIds.push(childIds[i])
+            }
+          }
+        }
+        this.$refs.menu.setCheckedKeys(this.menuIds)
+      })
+    },
+    // 保存菜单
+    saveMenu() {
+      this.menuLoading = true
+      const role = { id: this.currentId, menus: [] }
+      // 得到已选中的 key 值
+      this.menuIds.forEach(function(id) {
+        const menu = { id: id }
+        role.menus.push(menu)
+      })
+      crudRoles.editMenu(role).then(() => {
+        this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.menuLoading = false
+        this.update()
+      }).catch(err => {
+        this.menuLoading = false
+        console.log(err.response.data.message)
+      })
+    },
+    // 改变数据
+    update() {
+      // 无刷新更新 表格数据
+      crudRoles.get(this.currentId).then(res => {
+        for (let i = 0; i < this.crud.data.length; i++) {
+          if (res.id === this.crud.data[i].id) {
+            this.crud.data[i] = res
+            break
+          }
+        }
+      })
+    },
+    // 获取部门数据
+    getDepts() {
+      getDepts({ enabled: true }).then(res => {
+        this.depts = res.content.map(function(obj) {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    getSupDepts(depts) {
+      const ids = []
+      depts.forEach(dept => {
+        ids.push(dept.id)
+      })
+      getDeptSuperior(ids).then(res => {
+        const date = res.content
+        this.buildDepts(date)
+        this.depts = date
+      })
+    },
+    buildDepts(depts) {
+      depts.forEach(data => {
+        if (data.children) {
+          this.buildDepts(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null
+        }
+      })
+    },
+    // 获取弹窗内部门数据
+    loadDepts({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        getDepts({ enabled: true, pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 200)
+        })
+      }
+    },
+    // 如果数据权限为自定义则获取部门数据
+    changeScope() {
+      if (this.form.dataScope === '自定义') {
+        this.getDepts()
+      }
+    },
+    checkboxT(row) {
+      return row.level >= this.level
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+  .role-span {
+    font-weight: bold;color: #303133;
+    font-size: 15px;
+  }
+</style>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+ ::v-deep .el-input-number .el-input__inner {
+    text-align: left;
+  }
+ ::v-deep .vue-treeselect__multi-value{
+    margin-bottom: 0;
+  }
+ ::v-deep .vue-treeselect__multi-value-item{
+    border: 0;
+    padding: 0;
+  }
+</style>
diff --git a/src/views/system/user/customerUser.vue b/src/views/system/user/customerUser.vue
index 056e8d9..2c1cf15 100644
--- a/src/views/system/user/customerUser.vue
+++ b/src/views/system/user/customerUser.vue
@@ -1,624 +1,624 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--工具栏-->
-      <div class="head-container">
-        <div class="u-flex u-flex-wrap">
-          <!-- 搜索 -->
-          <div class="u-flex">
-            <label class="y-label">任务名称：</label>
-            <el-input
-              v-model="query.blurry"
-              clearable
-              size="small"
-              placeholder="请输入"
-              style="width: 170px;"
-              class="filter-item"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </div>
-          <div class="u-flex">
-            <label class="y-label">状态：</label>
-            <el-select
-              v-model="query.enabled"
-              clearable
-              size="small"
-              placeholder="请选择"
-              class="filter-item"
-              style="width: 170px"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in enabledTypeOptions"
-                :key="item.key"
-                :label="item.display_name"
-                :value="item.key"
-              />
-            </el-select>
-          </div>
-          <div class="u-flex">
-            <label class="y-label">日期：</label>
-            <date-range-picker v-model="query.createTime" class="date-item" />
-          </div>
-          <rrOperation style="margin-left: 5px;" />
-        </div>
-        <crudOperation show="" :permission="permission" @onRechargeArr="onRecharges">
-          <template v-slot:right>
-            <div class="rig-btn filter-item">
-              <el-upload
-                class="upload-demo"
-                :action="importUsers"
-                :show-file-list="false"
-                :headers="headers"
-                accept=".xlsx,.xls"
-                multiple
-                :limit="1"
-                :on-success="onsucess"
-                :on-error="onerror"
-              >
-                <el-button size="mini" type="primary">批量上传</el-button>
-              </el-upload>
-              <el-link type="primary" :underline="false" @click="downLink">(模板下载)</el-link>
-            </div>
-          </template>
-        </crudOperation>
-      </div>
-      <!--表单渲染-->
-      <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="570px">
-        <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="66px">
-          <el-form-item label="用户名" prop="username">
-            <el-input v-model="form.username" />
-          </el-form-item>
-          <el-form-item label="电话" prop="phone">
-            <el-input v-model.number="form.phone" />
-          </el-form-item>
-          <el-form-item label="昵称" prop="nickName">
-            <el-input v-model="form.nickName" />
-          </el-form-item>
-          <el-form-item label="邮箱" prop="email">
-            <el-input v-model="form.email" />
-          </el-form-item>
-          <el-form-item label="性别">
-            <el-radio-group v-model="form.gender" style="width: 178px">
-              <el-radio label="男">男</el-radio>
-              <el-radio label="女">女</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="状态">
-            <el-radio-group v-model="form.enabled" :disabled="form.id === user.id">
-              <el-radio
-                v-for="item in dict.user_status"
-                :key="item.id"
-                :label="item.value"
-              >{{ item.label }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="密码" prop="password">
-            <el-input v-model="form.password" placeholder="设置初始密码" />
-          </el-form-item>
-          <el-form-item label="角色" prop="roles">
-            <el-select
-              v-model="roleDatas"
-              placeholder="请选择"
-              style="width: 184px"
-              @change="changeRole"
-            >
-              <el-option
-                v-for="item in roles"
-                :key="item.name"
-                :disabled="level !== 1 && item.level <= level"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!-- 充值续费 -->
-      <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="packageProp" class="package-prop" title="充值续费" width="570px">
-        <div class="u-flex">
-          <label class="titles">系统：</label>
-          <div class="item-block active">
-            <span>{{ monthlyRent }}元/月</span>
-            <span class="tick"><i class="el-icon-check" /></span>
-          </div>
-        </div>
-        <div class="u-flex mt-10">
-          <label class="titles">通话：</label>
-          <div class="u-flex">
-            <div v-for="(item, index) in packageList" :key="index + 1" class="item-block conversation-item" :class="{ 'active': activeIndex == index }" @click="choiceBlock(index)">
-              <div>
-                <span>{{ item.packageNameStart }}</span>
-                <span class="link" :class="{ 'active': activeIndex == index }">{{ item.packageNameEnd }}</span>
-                <span v-if="activeIndex == index" class="tick"><i class="el-icon-check" /></span>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="u-flex mt-10">
-          <label class="titles" />
-          <div class="linkRed">(超出部分通话计费为{{ gobeyondPrice }}元/分钟)</div>
-        </div>
-        <div class="u-flex mt-10">
-          <label class="titles">总价：</label>
-          <div class="total">{{ totalPrice }}</div>
-        </div>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="packageProp = false">取消</el-button>
-          <el-button :loading="crud.status.cu === 2" type="primary" @click="onRechargesUser">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" :header-cell-style="{'text-align':'left'}" @selection-change="crud.selectionChangeHandler">
-        <el-table-column :selectable="checkboxT" type="selection" width="55" />
-        <el-table-column :show-overflow-tooltip="true" prop="username" width="210" label="用户名" />
-        <el-table-column :show-overflow-tooltip="true" prop="nickName" label="昵称" />
-        <el-table-column prop="gender" label="性别" width="80" />
-        <el-table-column :show-overflow-tooltip="true" width="90" prop="roles" label="角色">
-          <template slot-scope="scope">
-            <div v-for="item in scope.row.roles" :key="item.id">{{ item.name }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="phone" width="100" label="电话" />
-        <el-table-column :show-overflow-tooltip="true" prop="email" label="邮箱" />
-        <el-table-column prop="enabled" :render-header="renderHeader">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.enabled"
-              :disabled="user.id === scope.row.id"
-              active-color="#409EFF"
-              inactive-color="#F56C6C"
-              @change="changeEnabled(scope.row, scope.row.enabled)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="expirationTime" width="135" :render-header="renderTimeHeader">
-          <template slot-scope="scope">
-            <span v-if="scope.row.expirationTime">{{ parseTime(scope.row.expirationTime) }}</span>
-            <span v-else class="c-red">未开通服务</span>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-permission="['admin','user:edit','user:del']"
-          label="操作"
-          width="160"
-          fixed="right"
-        >
-          <template slot-scope="scope">
-            <udOperation
-              ref="udOperation"
-              :data="scope.row"
-              :permission="permission"
-              :user-list="userOptions"
-              :disabled-dle="scope.row.id === user.id"
-              :place-text="placeLodingText"
-              @onRecharge="onRecharges"
-              @onUserList="loadUser"
-            />
-          </template>
-        </el-table-column>
-        <template #empty>
-          <div style="width: 100%; height: 450px;display: flex; flex-direction: column; justify-content: center;align-items: center">
-            <img src="@/assets/images/zanwu.png" alt="">
-            <div>暂无数据</div>
-          </div>
-        </template>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </el-row>
-  </div>
-</template>
-
-<script>
-import crudUser from '@/api/system/user'
-import { isvalidPhone } from '@/utils/validate'
-import { getAll, getLevel } from '@/api/system/role'
-import { getToken } from '@/utils/auth'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import DateRangePicker from '@/components/DateRangePicker'
-import { mapGetters } from 'vuex'
-import { usersBuyCombo, userPersonnelList, payTemplateList, getFindDelUser } from '@/api/index'
-import store from '@/store'
-import Cookies from 'js-cookie'
-let userRoles = []
-let userJobs = []
-const defaultForm = { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 'false', password: null, roles: [], jobs: [], dept: { id: null }, phone: null }
-export default {
-  name: 'CustomerUser',
-  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
-  cruds() {
-    return CRUD({ title: '人员管理', url: 'api-management/api/users', crudMethod: { ...crudUser }})
-  },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  // 数据字典
-  dicts: ['user_status'],
-  data() {
-    // 自定义验证
-    const validPhone = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error('请输入电话号码'))
-      } else if (!isvalidPhone(value)) {
-        callback(new Error('请输入正确的11位手机号码'))
-      } else {
-        callback()
-      }
-    }
-    return {
-      height: document.documentElement.clientHeight - 180 + 'px;',
-      deptName: '', depts: [], deptDatas: [], jobs: [], level: 3, roles: [],
-      jobDatas: [], roleDatas: '', // 多选时使用
-      defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
-      permission: {
-        add: ['admin', 'user:add'],
-        edit: ['admin', 'user:edit'],
-        del: ['admin', ''],
-        download: ['admin', 'user:download'],
-        copy: true,
-        more: true,
-        recharge: true,
-        delUser: true
-      },
-      enabledTypeOptions: [
-        { key: 'true', display_name: '激活' },
-        { key: 'false', display_name: '锁定' }
-      ],
-      rules: {
-        username: [
-          { required: true, message: '请输入用户名', trigger: 'blur' },
-          { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
-        ],
-        nickName: [
-          { required: true, message: '请输入用户昵称', trigger: 'blur' },
-          { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
-        ],
-        phone: [
-          { required: true, trigger: 'blur', validator: validPhone }
-        ]
-      },
-      headers: {
-        Authorization: 'Bearer ' + getToken()
-      },
-      packageProp: false, // 套餐
-      monthlyRent: '', // 月租
-      gobeyondPrice: '', // 超出费用
-      packageList: [], // 套餐
-      activeIndex: 0, // 选中index
-      totalPrice: 0, // 总值
-      userOptions: [],
-      placeLodingText: '加载中...',
-      rechargesUserList: [] // 充值用户
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'user',
-      'importUsers'
-    ])
-  },
-  watch: {
-    activeIndex: {
-      handler(val) {
-        this.totalPrice = this.packageList[val].baseAmount + this.packageList[val].amount
-      },
-      deep: true
-    }
-  },
-  created() {
-    // this.crud.msg.add = '新增成功，默认密码：123456'
-  },
-  mounted: function() {
-    const that = this
-    window.onresize = function temp() {
-      that.height = document.documentElement.clientHeight - 180 + 'px;'
-    }
-    this.payTemplateList()
-  },
-  methods: {
-    // 导入用户
-    onsucess() {
-      this.crud.toQuery()
-    },
-    onerror(err) {
-      this.$notify.error({
-        title: '错误',
-        message: '导入错误，请检查用户名或号码是否重复后重新尝试'
-      })
-      const response = JSON.parse(err.message)
-      const code = response.code
-      if (code === 401) {
-        store.dispatch('LogOut').then(() => {
-          // 用户登录界面提示
-          Cookies.set('point', 401)
-          location.reload()
-        })
-      }
-    },
-    payTemplateList() {
-      payTemplateList().then(res => {
-        this.monthlyRent = res.baseFee
-        this.gobeyondPrice = res.beyondFee
-        this.packageList = res.list || []
-        this.packageList.forEach(r => {
-          const idx = r.packageName.indexOf('/')
-          r.packageNameStart = r.packageName.substring(0, idx)
-          r.packageNameEnd = r.packageName.substring(idx + 1)
-          this.totalPrice = this.packageList[0].baseAmount + this.packageList[0].amount
-        })
-      }).catch(() => {})
-    },
-    loadUser(id) {
-      this.placeLodingText = '加载中...'
-      getFindDelUser({ userId: id }).then(res => {
-        this.userOptions = res
-        this.placeLodingText = '请选择'
-      })
-    },
-    // 选择
-    choiceBlock(index) {
-      this.activeIndex = index
-    },
-    // 模板下载
-    downLink() {
-      userPersonnelList().then(res => {
-        window.location.href = res
-      })
-    },
-    changeRole(value) {
-      userRoles = []
-      // value.forEach(function(data, index) {
-      //   const role = { id: data }
-      //   userRoles.push(role)
-      // })
-      userRoles = [{ id: value }]
-    },
-    // deleteTag(value) {
-    //   userRoles.forEach(function(data, index) {
-    //     if (data.id === value) {
-    //       userRoles.splice(index, value)
-    //     }
-    //   })
-    // },
-    // 新增与编辑前做的操作
-    [CRUD.HOOK.afterToCU](crud, form) {
-      this.getRoles()
-      if (form.id == null) {
-        // this.getDepts()
-      } else {
-        // this.getSupDepts(form.dept.id)
-      }
-      this.getRoleLevel()
-      form.enabled = form.enabled.toString()
-    },
-    // 新增前将多选的值设置为空
-    [CRUD.HOOK.beforeToAdd]() {
-      this.jobDatas = []
-      this.roleDatas = ''
-    },
-    // 初始化编辑时候的角色
-    [CRUD.HOOK.beforeToEdit](crud, form) {
-      this.jobDatas = []
-      this.roleDatas = ''
-      userRoles = []
-      userJobs = []
-      const _this = this
-      form.roles.forEach(function(role, index) {
-        _this.roleDatas = role.id
-        const rol = { id: role.id }
-        userRoles.push(rol)
-      })
-      form.jobs.forEach(function(job, index) {
-        _this.jobDatas.push(job.id)
-        const data = { id: job.id }
-        userJobs.push(data)
-      })
-    },
-    // 提交前做的操作
-    [CRUD.HOOK.afterValidateCU](crud) {
-      if (!this.roleDatas) {
-        this.$message({
-          message: '角色不能为空',
-          type: 'warning'
-        })
-        return false
-      }
-      crud.form.roles = userRoles
-      crud.form.jobs = userJobs
-      return true
-    },
-    // 改变状态
-    changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        crudUser.edit(data).then(res => {
-          this.crud.notify(this.dict.label.user_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          data.enabled = !data.enabled
-        })
-      }).catch(() => {
-        data.enabled = !data.enabled
-      })
-    },
-    // 获取弹窗内角色数据
-    getRoles() {
-      getAll().then(res => {
-        this.roles = res
-      }).catch(() => { })
-    },
-    // 获取权限级别
-    getRoleLevel() {
-      getLevel().then(res => {
-        this.level = res.level
-      }).catch(() => { })
-    },
-    checkboxT(row, rowIndex) {
-      return row.id !== this.user.id
-    },
-    // 续费弹框
-    onRecharges(data) {
-      console.log(this.packageList)
-      if (this.packageList.length > 0) {
-        this.packageProp = true
-        this.rechargesUserList = data
-      } else {
-        this.$message.error('未分配套餐，请联系管理员')
-      }
-    },
-    // 充值账号
-    onRechargesUser() {
-      var arr = []
-      if (Array.isArray(this.rechargesUserList)) {
-        this.rechargesUserList.forEach(item => {
-          arr.push(item.id)
-        })
-      } else {
-        arr.push(this.rechargesUserList.id)
-      }
-      this.$confirm('确定续费吗, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        usersBuyCombo({ templateId: this.packageList[this.activeIndex].id, userIds: arr }).then(res => {
-          this.$message.success('续费成功')
-          this.packageProp = false
-          this.activeIndex = 0
-          setTimeout(() => {
-            this.$store.dispatch('GetInfo').then()
-            this.crud.refresh()
-          }, 800)
-        }).catch()
-      }).catch(() => { })
-    },
-    renderHeader(p) {
-      return p('span', {}, [
-        p('span', {}, '账号状态'),
-        p('el-popover', { props: { placement: 'top-start', width: '140', trigger: 'hover', content: '关闭将禁止该账号登录', 'popper-class': 'remind' }}, [
-          p('i', { slot: 'reference', class: 'el-icon-question' }, '')
-        ])
-      ])
-    },
-    renderTimeHeader(p) {
-      return p('span', {}, [
-        p('span', {}, '到期时间'),
-        p('el-popover', { props: { placement: 'top-start', width: '140', trigger: 'hover', content: '未续费或账号到期不能使用通话功能', 'popper-class': 'remind' }}, [
-          p('i', { slot: 'reference', class: 'el-icon-question' }, '')
-        ])
-      ])
-    }
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss">
-  .remind {
-    padding: 8px 10px!important;
-    font-size: 12px!important;
-  }
-</style>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
-    height: 30px;
-    line-height: 30px;
-  }
-  .active {
-    background-color: #3D80F4!important;
-    color: #fff!important;
-  }
-  .package-prop {
-     .titles {
-      width: 66px;
-      line-height: 32px;
-      float: none;
-      display: inline-block;
-      text-align: right;
-      vertical-align: middle;
-      font-size: 15px;
-      color: #606266;
-      padding: 0 12px 0 0;
-     }
-    .item-block {
-      width: 95px;
-      height: 55px;
-      border-radius: 5px;
-      background-color: #E4EEFA;
-      border: 1px solid #ebeef5;
-      color: #333;
-      font-weight: 600;
-      text-align: center;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      cursor: pointer;
-      position: relative;
-    }
-    .linkRed {
-      font-size: 12px;
-      color: #999;
-    }
-    .tick {
-      position: absolute;
-      bottom: 2px;
-      right: 2px;
-      background: #fff;
-      width: 14px;
-      height: 12px;
-      border-radius: 3px;
-      i {
-        color: #3D80F4;
-        font-size: 13px;
-        font-weight: 600;
-      }
-    }
-    .item-block:hover {
-      box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
-    }
-    .link {
-      font-size: 13px;
-      color: #999;
-      font-weight: 500;
-    }
-    .conversation-item div:nth-child(1) {
-      line-height: 17px;
-    }
-    .total {
-      font-size: 15px;
-      color: red;
-      font-weight: 600;
-      &:before {
-        content: '￥';
-        font-size: 17px;
-      }
-    }
-    .conversation-item {
-      display: flex;
-      margin-right: 8px;
-      flex-wrap: wrap;
-      span {
-        display: block;
-      }
-    }
-  }
-.rig-btn {
-    width: 180px;
-    display: flex!important;
-  }
-  .head-container ::v-deep .crud-opts-left {
-    display: inherit!important;
-  }
-</style>
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--工具栏-->
+      <div class="head-container">
+        <div class="u-flex u-flex-wrap">
+          <!-- 搜索 -->
+          <div class="u-flex">
+            <label class="y-label">任务名称：</label>
+            <el-input
+              v-model="query.blurry"
+              clearable
+              size="small"
+              placeholder="请输入"
+              style="width: 170px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </div>
+          <div class="u-flex">
+            <label class="y-label">状态：</label>
+            <el-select
+              v-model="query.enabled"
+              clearable
+              size="small"
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 170px"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in enabledTypeOptions"
+                :key="item.key"
+                :label="item.display_name"
+                :value="item.key"
+              />
+            </el-select>
+          </div>
+          <div class="u-flex">
+            <label class="y-label">日期：</label>
+            <date-range-picker v-model="query.createTime" class="date-item" />
+          </div>
+          <rrOperation style="margin-left: 5px;" />
+        </div>
+        <crudOperation show="" :permission="permission" @onRechargeArr="onRecharges">
+          <template v-slot:right>
+            <div class="rig-btn filter-item">
+              <el-upload
+                class="upload-demo"
+                :action="importUsers"
+                :show-file-list="false"
+                :headers="headers"
+                accept=".xlsx,.xls"
+                multiple
+                :limit="1"
+                :on-success="onsucess"
+                :on-error="onerror"
+              >
+                <el-button size="mini" type="primary">批量上传</el-button>
+              </el-upload>
+              <el-link type="primary" :underline="false" @click="downLink">(模板下载)</el-link>
+            </div>
+          </template>
+        </crudOperation>
+      </div>
+      <!--表单渲染-->
+      <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="570px">
+        <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="66px">
+          <el-form-item label="用户名" prop="username">
+            <el-input v-model="form.username" />
+          </el-form-item>
+          <el-form-item label="电话" prop="phone">
+            <el-input v-model.number="form.phone" />
+          </el-form-item>
+          <el-form-item label="昵称" prop="nickName">
+            <el-input v-model="form.nickName" />
+          </el-form-item>
+          <el-form-item label="邮箱" prop="email">
+            <el-input v-model="form.email" />
+          </el-form-item>
+          <el-form-item label="性别">
+            <el-radio-group v-model="form.gender" style="width: 178px">
+              <el-radio label="男">男</el-radio>
+              <el-radio label="女">女</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="状态">
+            <el-radio-group v-model="form.enabled" :disabled="form.id === user.id">
+              <el-radio
+                v-for="item in dict.user_status"
+                :key="item.id"
+                :label="item.value"
+              >{{ item.label }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="密码" prop="password">
+            <el-input v-model="form.password" placeholder="设置初始密码" />
+          </el-form-item>
+          <el-form-item label="角色" prop="roles">
+            <el-select
+              v-model="roleDatas"
+              placeholder="请选择"
+              style="width: 184px"
+              @change="changeRole"
+            >
+              <el-option
+                v-for="item in roles"
+                :key="item.name"
+                :disabled="level !== 1 && item.level <= level"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!-- 充值续费 -->
+      <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="packageProp" class="package-prop" title="充值续费" width="570px">
+        <div class="u-flex">
+          <label class="titles">系统：</label>
+          <div class="item-block active">
+            <span>{{ monthlyRent }}元/月</span>
+            <span class="tick"><i class="el-icon-check" /></span>
+          </div>
+        </div>
+        <div class="u-flex mt-10">
+          <label class="titles">通话：</label>
+          <div class="u-flex">
+            <div v-for="(item, index) in packageList" :key="index + 1" class="item-block conversation-item" :class="{ 'active': activeIndex == index }" @click="choiceBlock(index)">
+              <div>
+                <span>{{ item.packageNameStart }}</span>
+                <span class="link" :class="{ 'active': activeIndex == index }">{{ item.packageNameEnd }}</span>
+                <span v-if="activeIndex == index" class="tick"><i class="el-icon-check" /></span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="u-flex mt-10">
+          <label class="titles" />
+          <div class="linkRed">(超出部分通话计费为{{ gobeyondPrice }}元/分钟)</div>
+        </div>
+        <div class="u-flex mt-10">
+          <label class="titles">总价：</label>
+          <div class="total">{{ totalPrice }}</div>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="packageProp = false">取消</el-button>
+          <el-button :loading="crud.status.cu === 2" type="primary" @click="onRechargesUser">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" :header-cell-style="{'text-align':'left'}" @selection-change="crud.selectionChangeHandler">
+        <el-table-column :selectable="checkboxT" type="selection" width="55" />
+        <el-table-column :show-overflow-tooltip="true" prop="username" width="210" label="用户名" />
+        <el-table-column :show-overflow-tooltip="true" prop="nickName" label="昵称" />
+        <el-table-column prop="gender" label="性别" width="80" />
+        <el-table-column :show-overflow-tooltip="true" width="90" prop="roles" label="角色">
+          <template slot-scope="scope">
+            <div v-for="item in scope.row.roles" :key="item.id">{{ item.name }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="phone" width="100" label="电话" />
+        <el-table-column :show-overflow-tooltip="true" prop="email" label="邮箱" />
+        <el-table-column prop="enabled" :render-header="renderHeader">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.enabled"
+              :disabled="user.id === scope.row.id"
+              active-color="#409EFF"
+              inactive-color="#F56C6C"
+              @change="changeEnabled(scope.row, scope.row.enabled)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="expirationTime" width="135" :render-header="renderTimeHeader">
+          <template slot-scope="scope">
+            <span v-if="scope.row.expirationTime">{{ parseTime(scope.row.expirationTime) }}</span>
+            <span v-else class="c-red">未开通服务</span>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-permission="['admin','user:edit','user:del']"
+          label="操作"
+          width="140"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              ref="udOperation"
+              :data="scope.row"
+              :permission="permission"
+              :user-list="userOptions"
+              :disabled-dle="scope.row.id === user.id"
+              :place-text="placeLodingText"
+              @onRecharge="onRecharges"
+              @onUserList="loadUser"
+            />
+          </template>
+        </el-table-column>
+        <template #empty>
+          <div style="width: 100%; height: 450px;display: flex; flex-direction: column; justify-content: center;align-items: center">
+            <img src="@/assets/images/zanwu.png" alt="">
+            <div>暂无数据</div>
+          </div>
+        </template>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </el-row>
+  </div>
+</template>
+
+<script>
+import crudUser from '@/api/system/user'
+import { isvalidPhone } from '@/utils/validate'
+import { getAll, getLevel } from '@/api/system/role'
+import { getToken } from '@/utils/auth'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker'
+import { mapGetters } from 'vuex'
+import { usersBuyCombo, userPersonnelList, payTemplateList, getFindDelUser } from '@/api/index'
+import store from '@/store'
+import Cookies from 'js-cookie'
+let userRoles = []
+let userJobs = []
+const defaultForm = { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 'false', password: null, roles: [], jobs: [], dept: { id: null }, phone: null }
+export default {
+  name: 'CustomerUser',
+  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({ title: '人员管理', url: 'api-management/api/users', crudMethod: { ...crudUser }})
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  // 数据字典
+  dicts: ['user_status'],
+  data() {
+    // 自定义验证
+    const validPhone = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('请输入电话号码'))
+      } else if (!isvalidPhone(value)) {
+        callback(new Error('请输入正确的11位手机号码'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      deptName: '', depts: [], deptDatas: [], jobs: [], level: 3, roles: [],
+      jobDatas: [], roleDatas: '', // 多选时使用
+      defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
+      permission: {
+        add: ['admin', 'user:add'],
+        edit: ['admin', 'user:edit'],
+        del: ['admin', ''],
+        download: ['admin', 'user:download'],
+        copy: true,
+        more: true,
+        recharge: true,
+        delUser: true
+      },
+      enabledTypeOptions: [
+        { key: 'true', display_name: '激活' },
+        { key: 'false', display_name: '锁定' }
+      ],
+      rules: {
+        username: [
+          { required: true, message: '请输入用户名', trigger: 'blur' },
+          { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
+        ],
+        nickName: [
+          { required: true, message: '请输入用户昵称', trigger: 'blur' },
+          { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
+        ],
+        phone: [
+          { required: true, trigger: 'blur', validator: validPhone }
+        ]
+      },
+      headers: {
+        Authorization: 'Bearer ' + getToken()
+      },
+      packageProp: false, // 套餐
+      monthlyRent: '', // 月租
+      gobeyondPrice: '', // 超出费用
+      packageList: [], // 套餐
+      activeIndex: 0, // 选中index
+      totalPrice: 0, // 总值
+      userOptions: [],
+      placeLodingText: '加载中...',
+      rechargesUserList: [] // 充值用户
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'user',
+      'importUsers'
+    ])
+  },
+  watch: {
+    activeIndex: {
+      handler(val) {
+        this.totalPrice = this.packageList[val].baseAmount + this.packageList[val].amount
+      },
+      deep: true
+    }
+  },
+  created() {
+    // this.crud.msg.add = '新增成功，默认密码：123456'
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+    this.payTemplateList()
+  },
+  methods: {
+    // 导入用户
+    onsucess() {
+      this.crud.toQuery()
+    },
+    onerror(err) {
+      this.$notify.error({
+        title: '错误',
+        message: '导入错误，请检查用户名或号码是否重复后重新尝试'
+      })
+      const response = JSON.parse(err.message)
+      const code = response.code
+      if (code === 401) {
+        store.dispatch('LogOut').then(() => {
+          // 用户登录界面提示
+          Cookies.set('point', 401)
+          location.reload()
+        })
+      }
+    },
+    payTemplateList() {
+      payTemplateList().then(res => {
+        this.monthlyRent = res.baseFee
+        this.gobeyondPrice = res.beyondFee
+        this.packageList = res.list || []
+        this.packageList.forEach(r => {
+          const idx = r.packageName.indexOf('/')
+          r.packageNameStart = r.packageName.substring(0, idx)
+          r.packageNameEnd = r.packageName.substring(idx + 1)
+          this.totalPrice = this.packageList[0].baseAmount + this.packageList[0].amount
+        })
+      }).catch(() => {})
+    },
+    loadUser(id) {
+      this.placeLodingText = '加载中...'
+      getFindDelUser({ userId: id }).then(res => {
+        this.userOptions = res
+        this.placeLodingText = '请选择'
+      })
+    },
+    // 选择
+    choiceBlock(index) {
+      this.activeIndex = index
+    },
+    // 模板下载
+    downLink() {
+      userPersonnelList().then(res => {
+        window.location.href = res
+      })
+    },
+    changeRole(value) {
+      userRoles = []
+      // value.forEach(function(data, index) {
+      //   const role = { id: data }
+      //   userRoles.push(role)
+      // })
+      userRoles = [{ id: value }]
+    },
+    // deleteTag(value) {
+    //   userRoles.forEach(function(data, index) {
+    //     if (data.id === value) {
+    //       userRoles.splice(index, value)
+    //     }
+    //   })
+    // },
+    // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+      this.getRoles()
+      if (form.id == null) {
+        // this.getDepts()
+      } else {
+        // this.getSupDepts(form.dept.id)
+      }
+      this.getRoleLevel()
+      form.enabled = form.enabled.toString()
+    },
+    // 新增前将多选的值设置为空
+    [CRUD.HOOK.beforeToAdd]() {
+      this.jobDatas = []
+      this.roleDatas = ''
+    },
+    // 初始化编辑时候的角色
+    [CRUD.HOOK.beforeToEdit](crud, form) {
+      this.jobDatas = []
+      this.roleDatas = ''
+      userRoles = []
+      userJobs = []
+      const _this = this
+      form.roles.forEach(function(role, index) {
+        _this.roleDatas = role.id
+        const rol = { id: role.id }
+        userRoles.push(rol)
+      })
+      form.jobs.forEach(function(job, index) {
+        _this.jobDatas.push(job.id)
+        const data = { id: job.id }
+        userJobs.push(data)
+      })
+    },
+    // 提交前做的操作
+    [CRUD.HOOK.afterValidateCU](crud) {
+      if (!this.roleDatas) {
+        this.$message({
+          message: '角色不能为空',
+          type: 'warning'
+        })
+        return false
+      }
+      crud.form.roles = userRoles
+      crud.form.jobs = userJobs
+      return true
+    },
+    // 改变状态
+    changeEnabled(data, val) {
+      this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        crudUser.edit(data).then(res => {
+          this.crud.notify(this.dict.label.user_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        }).catch(() => {
+          data.enabled = !data.enabled
+        })
+      }).catch(() => {
+        data.enabled = !data.enabled
+      })
+    },
+    // 获取弹窗内角色数据
+    getRoles() {
+      getAll().then(res => {
+        this.roles = res
+      }).catch(() => { })
+    },
+    // 获取权限级别
+    getRoleLevel() {
+      getLevel().then(res => {
+        this.level = res.level
+      }).catch(() => { })
+    },
+    checkboxT(row, rowIndex) {
+      return row.id !== this.user.id
+    },
+    // 续费弹框
+    onRecharges(data) {
+      console.log(this.packageList)
+      if (this.packageList.length > 0) {
+        this.packageProp = true
+        this.rechargesUserList = data
+      } else {
+        this.$message.error('未分配套餐，请联系管理员')
+      }
+    },
+    // 充值账号
+    onRechargesUser() {
+      var arr = []
+      if (Array.isArray(this.rechargesUserList)) {
+        this.rechargesUserList.forEach(item => {
+          arr.push(item.id)
+        })
+      } else {
+        arr.push(this.rechargesUserList.id)
+      }
+      this.$confirm('确定续费吗, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        usersBuyCombo({ templateId: this.packageList[this.activeIndex].id, userIds: arr }).then(res => {
+          this.$message.success('续费成功')
+          this.packageProp = false
+          this.activeIndex = 0
+          setTimeout(() => {
+            this.$store.dispatch('GetInfo').then()
+            this.crud.refresh()
+          }, 800)
+        }).catch()
+      }).catch(() => { })
+    },
+    renderHeader(p) {
+      return p('span', {}, [
+        p('span', {}, '账号状态'),
+        p('el-popover', { props: { placement: 'top-start', width: '140', trigger: 'hover', content: '关闭将禁止该账号登录', 'popper-class': 'remind' }}, [
+          p('i', { slot: 'reference', class: 'el-icon-question' }, '')
+        ])
+      ])
+    },
+    renderTimeHeader(p) {
+      return p('span', {}, [
+        p('span', {}, '到期时间'),
+        p('el-popover', { props: { placement: 'top-start', width: '140', trigger: 'hover', content: '未续费或账号到期不能使用通话功能', 'popper-class': 'remind' }}, [
+          p('i', { slot: 'reference', class: 'el-icon-question' }, '')
+        ])
+      ])
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss">
+  .remind {
+    padding: 8px 10px!important;
+    font-size: 12px!important;
+  }
+</style>
+<style rel="stylesheet/scss" lang="scss" scoped>
+  ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
+    height: 30px;
+    line-height: 30px;
+  }
+  .active {
+    background-color: #3D80F4!important;
+    color: #fff!important;
+  }
+  .package-prop {
+     .titles {
+      width: 66px;
+      line-height: 32px;
+      float: none;
+      display: inline-block;
+      text-align: right;
+      vertical-align: middle;
+      font-size: 15px;
+      color: #606266;
+      padding: 0 12px 0 0;
+     }
+    .item-block {
+      width: 95px;
+      height: 55px;
+      border-radius: 5px;
+      background-color: #E4EEFA;
+      border: 1px solid #ebeef5;
+      color: #333;
+      font-weight: 600;
+      text-align: center;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      cursor: pointer;
+      position: relative;
+    }
+    .linkRed {
+      font-size: 12px;
+      color: #999;
+    }
+    .tick {
+      position: absolute;
+      bottom: 2px;
+      right: 2px;
+      background: #fff;
+      width: 14px;
+      height: 12px;
+      border-radius: 3px;
+      i {
+        color: #3D80F4;
+        font-size: 13px;
+        font-weight: 600;
+      }
+    }
+    .item-block:hover {
+      box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
+    }
+    .link {
+      font-size: 13px;
+      color: #999;
+      font-weight: 500;
+    }
+    .conversation-item div:nth-child(1) {
+      line-height: 17px;
+    }
+    .total {
+      font-size: 15px;
+      color: red;
+      font-weight: 600;
+      &:before {
+        content: '￥';
+        font-size: 17px;
+      }
+    }
+    .conversation-item {
+      display: flex;
+      margin-right: 8px;
+      flex-wrap: wrap;
+      span {
+        display: block;
+      }
+    }
+  }
+.rig-btn {
+    width: 180px;
+    display: flex!important;
+  }
+  .head-container ::v-deep .crud-opts-left {
+    display: inherit!important;
+  }
+</style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e23823d..a2af724 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -173,7 +173,7 @@
         <el-table-column
           v-permission="['admin','user:edit','user:del']"
           label="操作"
-          width="160"
+          width="140"
           fixed="right"
         >
           <template slot-scope="scope">
@@ -246,7 +246,7 @@
                   />
                   <el-table-column
                     label="操作"
-                    width="100"
+                    width="75"
                   >
                     <template slot-scope="scope">
                       <!-- <el-button
@@ -278,7 +278,7 @@
             </el-table-column>
             <el-table-column
               label="操作"
-              width="140"
+              width="100"
             >
               <template slot-scope="scope">
                 <el-button
diff --git a/src/views/system/user/toExamineUser.vue b/src/views/system/user/toExamineUser.vue
index 0cc79ab..836ac47 100644
--- a/src/views/system/user/toExamineUser.vue
+++ b/src/views/system/user/toExamineUser.vue
@@ -91,7 +91,7 @@
         <el-table-column
           v-permission="['admin']"
           label="操作"
-          width="175"
+          width="100"
           fixed="right"
         >
           <!-- <template slot-scope="scope">
@@ -359,7 +359,7 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="90">
+          <el-table-column label="操作" width="75">
             <template slot-scope="scope">
               <el-button @click="dohankClick({ type: 'dyAuthorization', row: scope.row, action: 'url' })">授权</el-button>
             </template>
diff --git a/src/views/teamMember/resources/currentIndex.vue b/src/views/teamMember/resources/currentIndex.vue
index 6241e96..a9a47b4 100644
--- a/src/views/teamMember/resources/currentIndex.vue
+++ b/src/views/teamMember/resources/currentIndex.vue
@@ -151,7 +151,7 @@
           </el-table-column>
           <el-table-column
             label="操作"
-            width="200"
+            width="160"
           >
             <template slot-scope="scope">
               <el-button
diff --git a/src/views/teamMember/resources/tokerIndex.vue b/src/views/teamMember/resources/tokerIndex.vue
index 5ebed26..a1fbc63 100644
--- a/src/views/teamMember/resources/tokerIndex.vue
+++ b/src/views/teamMember/resources/tokerIndex.vue
@@ -164,7 +164,7 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="200">
+          <el-table-column label="操作" width="160">
             <template slot-scope="scope">
               <el-button
                 size="mini"
@@ -173,7 +173,7 @@
                 icon="el-icon-phone"
                 @click="dialTel(scope.row)"
               >拨打</el-button>
-              <el-button size="mini" type="text" @click.stop="rowClick(scope.row)">通话记录</el-button>
+              <el-button size="mini" type="text" @click.stop="rowClick(scope.row)">详情</el-button>
               <el-button
                 v-if="callMode !== 1"
                 size="mini"
diff --git a/src/views/tokerModular/compensationDMP.vue b/src/views/tokerModular/compensationDMP.vue
index fcde522..20113ee 100644
--- a/src/views/tokerModular/compensationDMP.vue
+++ b/src/views/tokerModular/compensationDMP.vue
@@ -47,7 +47,7 @@
       </el-table-column>
       <el-table-column
         label="操作"
-        width="100"
+        width="75"
         fixed="right"
       >
         <template slot-scope="scope">
diff --git a/src/views/tokerModular/currentTask.vue b/src/views/tokerModular/currentTask.vue
index 6f5dc53..019f14a 100644
--- a/src/views/tokerModular/currentTask.vue
+++ b/src/views/tokerModular/currentTask.vue
@@ -197,7 +197,7 @@
           </el-table-column>
           <el-table-column
             label="操作"
-            width="140"
+            width="100"
             fixed="right"
           >
             <template slot-scope="scope">
diff --git a/src/views/tokerModular/tokerTask.vue b/src/views/tokerModular/tokerTask.vue
index eda90a1..fb71a18 100644
--- a/src/views/tokerModular/tokerTask.vue
+++ b/src/views/tokerModular/tokerTask.vue
@@ -196,7 +196,7 @@
           </el-table-column>
           <el-table-column
             label="操作"
-            width="140"
+            width="100"
             fixed="right"
           >
             <template slot-scope="scope">