Merge branch 'master' into zm

# Conflicts:
#	config/index.js

src/views/crm/components/CRMDetailHead.vue

@@ -102,6 +102,12 @@
       :selection-list="[detail]"
       :dialog-visible.sync="allocDialogShow"
       @handle="handleCallBack" />
+    <get-handle
+      :crm-type="crmType"
+      :pool_id="pool_id"
+      :selection-list="[detail]"
+      :dialog-visible.sync="getDialogShow"
+      @handle="handleCallBack" />
     <deal-status-handle
       :value="detail.dealStatus"
       :crm-type="crmType"
@@ -141,6 +147,7 @@ import {
 import { crmInvoiceDeleteIdsAPI } from '@/api/crm/invoice'
 import TransferHandle from './SelectionHandle/TransferHandle' // 转移
 import AllocHandle from './SelectionHandle/AllocHandle' // 公海分配操作
+import GetHandle from './SelectionHandle/GetHandle' // 公海分配操作
 import DealStatusHandle from './SelectionHandle/DealStatusHandle' // 客户状态修改操作
 import PutPoolHandle from './SelectionHandle/PutPoolHandle' // 放入公海
 
@@ -149,6 +156,7 @@ export default {
   components: {
     TransferHandle,
     AllocHandle,
+    GetHandle,
     DealStatusHandle,
     PutPoolHandle
   },
@@ -188,6 +196,7 @@ export default {
       moreTypes: [], // 更多操作
       transferDialogShow: false, // 转移操作
       allocDialogShow: false, // 公海分配操作提示框
+      getDialogShow: false, // 公海领取提示框
       dealStatusShow: false, // 成交状态修改框
       putPoolShow: false // 客户放入公海
     }
@@ -230,7 +239,7 @@ export default {
     showTransfer() {
       if (
         this.crmType === 'customer' ||
-         this.crmType === 'visit' ||
+        this.crmType === 'visit' ||
         this.isSeas
       ) {
         return false
@@ -315,7 +324,6 @@ export default {
         type == 'unlock' ||
         type == 'start' ||
         type == 'disable' ||
-        type == 'get' ||
         type == 'cancel'
       ) {
         var message = ''
@@ -352,6 +360,9 @@ export default {
       } else if (type == 'alloc') {
         // 公海分配操作
         this.allocDialogShow = true
+      } else if (type == 'get') {
+        // 公海分配操作
+        this.getDialogShow = true
       } else if (type == 'deal_status') {
         // 客户成交状态操作
         this.dealStatusShow = true

src/views/crm/components/CRMTableHead.vue

@@ -88,6 +88,12 @@
       :selection-list="selectionList"
       :dialog-visible.sync="allocDialogShow"
       @handle="handleCallBack" />
+    <get-handle
+      :crm-type="crmType"
+      :pool_id="pool_id"
+      :selection-list="selectionList"
+      :dialog-visible.sync="getDialogShow"
+      @handle="handleCallBack" />
     <deal-status-handle
       :crm-type="crmType"
       :selection-list="selectionList"
@@ -169,6 +175,7 @@ import SceneCreate from './SceneForm/SceneCreate'
 import TransferHandle from './SelectionHandle/TransferHandle' // 转移
 import TeamsHandle from './SelectionHandle/TeamsHandle' // 操作团队成员
 import AllocHandle from './SelectionHandle/AllocHandle' // 公海分配操作
+import GetHandle from './SelectionHandle/GetHandle' // 公海领取操作
 import DealStatusHandle from './SelectionHandle/DealStatusHandle' // 客户状态修改操作
 import PutPoolHandle from './SelectionHandle/PutPoolHandle' // 放入公海
 
@@ -184,6 +191,7 @@ export default {
     TransferHandle,
     TeamsHandle,
     AllocHandle,
+    GetHandle,
     SceneCreate,
     SceneSet,
     DealStatusHandle,
@@ -232,6 +240,7 @@ export default {
       teamsDialogShow: false, // 团队操作提示框
       teamsType: '', // 团队操作标题名
       allocDialogShow: false, // 公海分配操作提示框
+      getDialogShow: false, // 领取操作提示框
       dealStatusShow: false, // 成交状态修改框
       putPoolShow: false // 客户放入公海
 
@@ -400,8 +409,7 @@ export default {
         type == 'lock' ||
         type == 'unlock' ||
         type == 'start' ||
-        type == 'disable' ||
-        type == 'get'
+        type == 'disable'
       ) {
         var message = ''
         if (type == 'transform') {
@@ -437,6 +445,9 @@ export default {
         // 团队操作
         this.teamsType = 'delete'
         this.teamsDialogShow = true
+      } else if (type == 'get') {
+        // 公海领取操作
+        this.getDialogShow = true
       } else if (type == 'alloc') {
         // 公海分配操作
         this.allocDialogShow = true

src/views/crm/components/SelectionHandle/GetHandle.vue

@@ -0,0 +1,176 @@
+<template>
+  <el-dialog
+    v-loading="loading"
+    :visible.sync="visible"
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    title="领取"
+    width="400px"
+    @close="handleCancel">
+    <div class="handle-box">
+      <flexbox
+        class="handle-item"
+        align="stretch">
+        <div
+          class="handle-item-name"
+          style="margin-top: 8px;">审批人：</div>
+        <xh-user-cell
+          :value="usersList"
+          class="handle-item-content"
+          @value-change="userChage"/>
+      </flexbox>
+    </div>
+    <span
+      slot="footer"
+      class="dialog-footer">
+      <el-button @click.native="handleCancel">取消</el-button>
+      <el-button
+        v-debounce="handleConfirm"
+        type="primary">保存</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { XhUserCell } from '@/components/CreateCom'
+import { crmCustomerReceiveAPI } from '@/api/crm/customer'
+
+export default {
+  /** 客户管理 的 勾选后的 公海分配 操作*/
+  name: 'GetHandle',
+  components: {
+    XhUserCell
+  },
+  mixins: [],
+  props: {
+    dialogVisible: {
+      type: Boolean,
+      required: true,
+      default: false
+    },
+    /** 没有值就是全部类型 有值就是当个类型 */
+    crmType: {
+      type: String,
+      default: ''
+    },
+    pool_id: [String, Number],
+    /** 转移数据 */
+    selectionList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      loading: true,
+      visible: false,
+      usersList: []
+    }
+  },
+  computed: {},
+  watch: {
+    dialogVisible: {
+      handler(val) {
+        this.visible = val
+        if (!val) {
+          this.usersList = []
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  mounted() {
+    this.visible = this.dialogVisible
+  },
+  methods: {
+    /**
+     * 取消选择
+     */
+    handleCancel() {
+      this.visible = false
+      this.$emit('update:dialogVisible', false)
+    },
+    /** 负责人更改 */
+    userChage(data) {
+      this.usersList = data.value
+    },
+    handleConfirm() {
+      // 移除操作不可移除客户负责人
+      if (this.usersList.length === 0) {
+        // this.$message.error('请选择审批人')
+        this.loading = true
+        crmCustomerReceiveAPI({
+          customer_id: this.selectionList.map(item => item.customer_id),
+          pool_id: this.pool_id
+        })
+          .then(res => {
+            this.$message({
+              type: 'success',
+              message: '操作成功'
+            })
+            this.loading = false
+            this.$emit('handle', {
+              type: 'alloc'
+            })
+            this.handleCancel()
+          })
+          .catch(() => {
+            this.loading = false
+          })
+        this.handleCancel()
+      } else {
+        this.loading = true
+        crmCustomerReceiveAPI({
+          customer_id: this.selectionList.map(item => item.customer_id),
+          pool_id: this.pool_id,
+          check_user_id: this.usersList[0].id
+        })
+          .then(res => {
+            this.$message({
+              type: 'success',
+              message: '操作成功'
+            })
+            this.loading = false
+            this.$emit('handle', {
+              type: 'alloc'
+            })
+            this.handleCancel()
+          })
+          .catch(() => {
+            this.loading = false
+          })
+        this.handleCancel()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.handle-box {
+  color: #333;
+  font-size: 12px;
+}
+.handle-item {
+  padding-bottom: 15px;
+  .handle-item-name {
+    flex-shrink: 0;
+    width: 90px;
+  }
+  .handle-item-content {
+    flex: 1;
+  }
+}
+.handle-bar {
+  position: relative;
+  margin-top: 10px;
+  height: 30px;
+  button {
+    float: right;
+    margin-right: 10px;
+  }
+}
+</style>

src/views/crm/workbench/components/SalesFunnel.vue

@@ -34,11 +34,12 @@
     <div id="sales-funnel" />
     <flexbox justify="center" class="info-box">
       <flexbox direction="column" class="info-item">
-        <div class="label">赢单单数</div>
+        <!-- <button id="btn-win" class="btn-num" style="color: #6ca2ff;" @click="getView()">赢单单数</button> -->
+        <button class="btn-num" style="color: #6ca2ff;" @click="pushView()">赢单单数</button>
         <div class="value">{{ funnelData.winSingle }}单</div>
       </flexbox>
       <flexbox direction="column" class="info-item">
-        <div class="label">输单单数</div>
+        <button class="btn-num" @click="pushView()">输单单数</button>
         <div class="value">{{ funnelData.loseSingle }}单</div>
       </flexbox>
     </flexbox>
@@ -129,7 +130,6 @@ export default {
       businessOptions: [],
       businessId: null,
       businessName: '',
-
       funnelData: {}
     }
   },
@@ -138,6 +138,9 @@ export default {
     this.getBusinessStatusList()
   },
   methods: {
+    pushView() {
+      this.$router.push('/crm/business')
+    },
     initChart() {
       this.chartObj = echarts.init(document.getElementById('sales-funnel'))
       this.chartObj.setOption(this.chartOption, true)
@@ -145,6 +148,10 @@ export default {
         this.$emit('chart-click', params, this.dataList[params.dataIndex])
       })
     },
+    // getView() {
+    //   console.log('aa' + this.dataList)
+    //   this.$emit('chart-click', [], this.dataList[1])
+    // },
     /**
      * 获取统计数据
      */
@@ -227,7 +234,11 @@ export default {
     height: 322px;
     margin-top: 10px;
   }
-
+  .btn-num {
+    color: #ff7474;
+    background: none;
+    border: none;
+  }
   .sales-funnel {
     position: relative;
     .card-title-left .icon {