Merge branch 'master' into zm

src/api/crm/customer.js

@@ -55,6 +55,18 @@ export function crmCustomerPoolListAPI(data) {
   })
 }
 
+/**
+ *【客户】类型列表
+ * @param {*} data
+ */
+export function crmCustomerType(data) {
+  return request({
+    url: 'crm/customer/type',
+    method: 'post',
+    data: data
+  })
+}
+
 /**
  * 删除
  * @param {*} data

src/api/crm/message.js

@@ -152,6 +152,21 @@ export function crmMessagNumAPI(data) {
   })
 }
 
+/**
+ * 总经理客户公海池消息
+ * @param {*} data
+ */
+export function crmCustomerNumForC(data) {
+  return request({
+    url: 'crm/customerPool/num',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
 /**
  * 待进入客户池
  * @param {*} data

src/store/modules/crm.js

@@ -1,5 +1,6 @@
 import {
-  crmMessagNumAPI
+  crmMessagNumAPI,
+  crmCustomerNumForC
 } from '@/api/crm/message'
 
 /**
@@ -52,6 +53,9 @@ const app = {
           .catch(error => {
             reject(error)
           })
+        crmCustomerNumForC().then(res => {
+          console.log(res.data)
+        }).catch(() => {})
       })
     }
 

src/views/admin/crm/customer/components/PoolAdd.vue

@@ -84,6 +84,21 @@
         <create-sections
           v-if="recycleRuleData"
           title="规则设置">
+          <flexbox
+            class="row"
+            align="stretch">
+            <div class="row-label">客户类型列表</div>
+            <div class="row-content">
+              <el-select
+                v-model="baseFrom.customerTypes">
+                <el-option
+                  v-for="itemOption in customerTypes"
+                  :key="itemOption.value"
+                  :label="itemOption.name"
+                  :value="itemOption.value"/>
+              </el-select>
+            </div>
+          </flexbox>
           <flexbox
             class="row"
             align="stretch">
@@ -200,7 +215,8 @@ import {
   crmCustomerPoolQueryPoolFieldAPI,
   crmCustomerPoolSetAPI,
   crmCustomerPoolSetDetailAPI,
-  crmCustomerPoolQueryLevelAPI
+  crmCustomerPoolQueryLevelAPI,
+  crmCustomerType
 } from '@/api/crm/customer'
 
 import CreateView from '@/components/CreateView'
@@ -264,6 +280,7 @@ export default {
       recycleRuleData: null,
       levelCustomerName: [], // 客户级别数据源
       customerPoolFields: [],
+      customerTypes: [], // 客户类型
       requestFields: {
         before_owner_day: '前负责人限制领取天数需大于0',
         receive_count: '领取频率限制个数需大于0',
@@ -293,6 +310,7 @@ export default {
     }
 
     this.getLevelCustomerData()
+    this.getCustomerTypes()
   },
 
   beforeDestroy() {},
@@ -302,7 +320,11 @@ export default {
         this.levelCustomerName = res.data || []
       }).catch(() => {})
     },
-
+    getCustomerTypes() {
+      crmCustomerType().then(res => {
+        this.customerTypes = res.data || []
+      }).catch(() => {})
+    },
     /**
      * 编辑操作
      */
@@ -331,6 +353,7 @@ export default {
           users: data.user_info,
           strucs: data.department_info
         },
+        customerTypes: data.crm_customer_type,// 客户类型列表
         before_owner_conf: data.before_owner_conf, // 前负责人领取规则 0不限制 1限制
         before_owner_day: data.before_owner_day,
         receive_conf: data.receive_conf, // 0 不启用 1 启用
@@ -393,6 +416,7 @@ export default {
           users: [],
           strucs: []
         },
+        customerTypes: [],
         before_owner_conf: 0, // 前负责人领取规则 0不限制 1限制
         before_owner_day: '',
         receive_conf: 0, // 0 不启用 1 启用
@@ -626,7 +650,6 @@ export default {
       }
       // 公海字段
       params.field = this.customerPoolFields
-
       return params
     },
 

src/views/crm/customer/Detail.vue

@@ -192,6 +192,7 @@ export default {
         { title: '客户级别', value: '' },
         { title: '成交状态', value: '' },
         { title: '负责人', value: '' },
+        { title: '审批发起人', value: '' },
         { title: '更新时间', value: '' }
       ],
       tabCurrentName: 'Activity',
@@ -440,7 +441,8 @@ export default {
 
           this.headDetails[2].title = this.isSeasDetail ? '' : '负责人'
           this.headDetails[2].value = this.isSeasDetail ? this.detailDatabefore_owner_user_name : this.detailData.owner_user_id_info.realname || ''
-          this.headDetails[3].value = this.detailData.create_time
+          this.headDetails[4].value = this.detailData.create_time
+          this.headDetails[3].value = this.detailData.create_user_name
         })
         .catch(() => {
           this.loading = false

src/views/layout/components/Sidebar/index.vue

@@ -142,6 +142,7 @@ export default {
     }
   },
   mounted() {
+    console.log('aaaaaa' + this.items[0].num)
     this.buttonCollapse = this.collapse
   },
   methods: {