本地

README.md

@@ -8,15 +8,17 @@
 
 公司先后获得河南省高新技术企业、国家3A信用企业、IOS9001软件产品认证等20多项荣誉奖项。拥有50余项软件著作权。 获得20余家国内媒体报道。公司自成立以来，以高科技为起点，以技术为核心、 以完善的售后服务为后盾，秉承稳固与发展、求实与创新的精神，已为国内外上万家企业提供了服务。 在为实现企业价值最大化的过程中， 实现了自身的价值的提升，取得了最大程度的双赢合作，并获得了社会各界的广泛赞誉和认同。
 
-官网地址：[http://www.5kcrm.com](http://www.5kcrm.com/)
+官网：[http://www.5kcrm.com](https://www.5kcrm.com/)
 
-演示地址：(http://demo11.5kcrm.net/)  
+官网：[http://www.72crm.com](https://www.72crm.com/)
-帐号：18688888888   密码：123456a
 
-Github下载地址：[https://github.com/72wukong](https://github.com/72wukong)  
+论坛：[http://bbs.72crm.net](https://bbs.72crm.net/)
 
-QQ群交流群⑩群：[1026560336](http:////shang.qq.com/wpa/qunwpa?idkey=13d5e5809eb9feb350336e55c8b7a00b9cb472078b09b4441222a52dd76b278e)
+演示地址：[demo11.5kcrm.net](http://demo11.5kcrm.net/)(帐号：18888888888   密码：123456a)
 
+码云gitee地址：[码云仓库地址](https://gitee.com/wukongcrm)
+
+QQ群交流群⑩群：[486745026](https:////shang.qq.com/wpa/qunwpa?idkey=f4687b809bf63f08f707aa1c56dee8dbcb9526237c429c4532222021d65bf83c)
 
 扫码添加小悟官方客服微信，邀您加入千人微信交流群：
 
@@ -27,14 +29,13 @@ QQ群交流群⑩群：[1026560336](http:////shang.qq.com/wpa/qunwpa?idkey=13d5e
 <img src="https://images.gitee.com/uploads/images/2019/1202/135713_d3566c6a_345098.jpeg" width="200">
 
 
-
 ```
 
 注：悟空CRM采用全新的前后端分离模式，本仓库代码中已集成前端vue打包后文件，可免去打包操作。如需调整前端代码，请单独下载前端代码
 
 ```
 
-(<a href="https://gitee.com/wukongcrm/crm_pro" target="_blank">查看PHP后端仓库</a>) 
+(<a href="https://github.com/72wukong/72crm-11.0-PHP" target="_blank">查看PHP后端仓库</a>) 
 
 
 #### 项目目录

build/webpack.base.conf.js

@@ -6,7 +6,7 @@ const {
     VueLoaderPlugin
 } = require('vue-loader')
 const vueLoaderConfig = require('./vue-loader.conf')
-// el-bigdata-table babel-loader 配置
+    // el-bigdata-table babel-loader 配置
 const fs = require('fs')
 
 function resolve(dir) {
@@ -36,10 +36,9 @@ module.exports = {
     output: {
         path: config.build.assetsRoot,
         filename: '[name].js',
-    publicPath:
+        publicPath: process.env.NODE_ENV === 'production' ?
-      process.env.NODE_ENV === 'production'
+            config.build.assetsPublicPath :
-        ? config.build.assetsPublicPath
+            config.dev.assetsPublicPath
-        : config.dev.assetsPublicPath
     },
     resolve: {
         extensions: ['.js', '.vue', '.json'],
@@ -49,7 +48,7 @@ module.exports = {
     },
     module: {
         rules: [
-      ...(config.dev.useEslint ? [createLintingRule()] : []),
+            // ...(config.dev.useEslint ? [createLintingRule()] : []),
             {
                 test: /\.vue$/,
                 loader: 'vue-loader',

config/dev.env.js

@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
     NODE_ENV: '"development"',
-  BASE_API: '"http://localhost/"',
+    BASE_API: '"/api/"',
 })

config/index.js

@@ -11,14 +11,14 @@ module.exports = {
         assetsPublicPath: '/',
         proxyTable: {
             '/api': {
-        target: 'http://localhost',
+                target: 'http://192.168.50.40:8088',
                 changeOrigin: true,
                 pathRewrite: {
                     '^/api': ''
                 }
             },
             '/file': {
-        target: 'http://192.168.1.116:8012/',
+                target: 'http://192.168.50.40:8088/',
                 changeOrigin: true,
                 pathRewrite: {
                     '^/file': ''
@@ -28,7 +28,7 @@ module.exports = {
 
         // Various Dev Server settings
         host: '0.0.0.0', // can be overwritten by process.env.HOST
-    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+        port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
         autoOpenBrowser: false,
         errorOverlay: true,
         notifyOnErrors: false,

package.json

@@ -23,6 +23,7 @@
     "@tinymce/tinymce-vue": "^3.2.0",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
+    "chalk": "^5.2.0",
     "clipboard": "^2.0.4",
     "echarts": "^4.3.0",
     "el-bigdata-table": "^1.0.32",
@@ -66,7 +67,6 @@
     "babel-plugin-transform-vue-jsx": "3.7.0",
     "babel-preset-env": "1.7.0",
     "babel-preset-stage-2": "6.24.1",
-    "chalk": "2.4.1",
     "copy-webpack-plugin": "4.5.2",
     "css-loader": "1.0.0",
     "eslint": "4.19.1",

src/api/crm/customer.js

@@ -434,6 +434,20 @@ export function crmCustomerReceiveAPI(data) {
   })
 }
 
+/**
+ * 【客户】领取公海客户审批
+ * @param {*} data
+ */
+export function crmCheckCustomerReceiveAPI(data) {
+  return request({
+    url: 'crm/customerPool/checkCustomerReveive',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
 /**
  * 客户下联系人
  * @param {*} data

src/api/crm/message.js

@@ -197,6 +197,50 @@ export function crmMessageCheckInvoiceAPI(data) {
   })
 }
 
+/**
+ * 待审核商机
+ * @param {*} data
+ */
+export function crmMessageCheckBusinessAPI(data) {
+  return request({
+    url: 'crm/message/checkBusiness',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+/**
+ * 新商机
+ * @param {*} data
+ */
+export function crmMessageNewBusinessAPI(data) {
+  return request({
+    url: 'crm/message/newBusiness',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+/**
+ * 客户捞取审批待办事项提醒
+ * @param {*} data
+ */
+export function crmMessageCheckCustomerCheckAPI(data) {
+  return request({
+    url: 'crm/message/checkCustomerCheck',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
 /**
  * 全部标为已处理接口
  * @param {*} data

src/api/examine/index.js

@@ -127,6 +127,37 @@ export function crmExamineReceivablesAuditAPI(data) {
     }
   })
 }
+/**
+ * 进行商机
+ */
+export function crmExamineBusinessAuditAPI(data) {
+  // const url = data.type === 'revoke' ? 'crm/receivables/revokeCheck' : 'crm/receivables/check'
+  const url = 'crm/business/check'
+  return request({
+    url,
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+/**
+ * 进行客户
+ */
+export function crmExamineCheckCustomerAuditAPI(data) {
+  // const url = data.type === 'revoke' ? 'crm/receivables/revokeCheck' : 'crm/receivables/check'
+  const url = 'crm/customerPool/checkCustomerReveive'
+  return request({
+    url,
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
 
 /**
  * 查询审批记录