From 0d0781ec91d987edeadfc3905e2800e5ffe2eba8 Mon Sep 17 00:00:00 2001
From: Sirio <caoxinyu@meswork.com>
Date: Wed, 10 Apr 2019 12:55:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80=E7=BB=8F=E7=90=86=E7=89=87?=
 =?UTF-8?q?=E5=8C=BA=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                         |   1 -
 src/views/MarketingCenter/CRM/index.vue | 113 ++++++++++++------------
 2 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/config/index.js b/config/index.js
index 2d9a62d1..47c7e8d1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -8,7 +8,6 @@ const os = require('os')
 const networkInterfaces = os.networkInterfaces()
 
 const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
-
 module.exports = {
   dev: {
     // Paths
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index b6ddc1b5..46a4245f 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -23,6 +23,51 @@
       <!--</el-select>-->
       <el-button type="success" icon="el-icon-search" class="move" size="small" @click="selectCustomerOfName">查询</el-button>
     </el-card>
+    <el-card>
+      <el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click="addMarketingManager();flag = 1">添加销售经理</el-button>
+      <span style="float: right">销售经理</span>
+      <el-table v-loading="loading3" :data="tableData3" height="192" style="width: 100%;margin-top: 10px" border>
+        <!--<el-table-column label="责权省份" align="center" min-width="80">-->
+          <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.省份 }}-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+        <el-table-column label="姓名" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="性别" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.性别 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="联系电话" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.联系电话 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="生日" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.出生日期 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="200px" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              class="el-icon-edit"
+              @click="handleEditMarketingManager(scope.row);flag = 2">编辑</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              class="el-icon-delete"
+              @click="handleDeleteMarketingManager(scope.$index, scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
     <el-row>
       <el-col :span="6">
         <el-card>
@@ -49,55 +94,10 @@
         </el-card>
       </el-col>
       <el-col :span="18">
-        <el-card>
-          <el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click="addMarketingManager();flag = 1">添加销售经理</el-button>
-          <span style="float: right">销售经理</span>
-          <el-table v-loading="loading3" :data="tableData3" height="192" style="width: 100%;margin-top: 10px" border>
-            <el-table-column label="责权省份" align="center" min-width="80">
-              <template slot-scope="scope">
-                {{ scope.row.省份 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="姓名" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.姓名 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="性别" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.性别 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="联系电话" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.联系电话 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="生日" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.出生日期 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="200px" fixed="right">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="primary"
-                  class="el-icon-edit"
-                  @click="handleEditMarketingManager(scope.row);flag = 2">编辑</el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  class="el-icon-delete"
-                  @click="handleDeleteMarketingManager(scope.$index, scope.row)">删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-card>
         <el-card>
           <el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click = "addCustomer();flag1 = 1">新增客户</el-button>
           <span style="float: right">客户信息</span>
-          <el-table v-loading="loading2" :data="tableData2" height="400" style="width: 100%;margin-top: 10px" border>
+          <el-table v-loading="loading2" :data="tableData2" height="670" style="width: 100%;margin-top: 10px" border>
             <el-table-column label="省份" align="center" min-width="80px">
               <template slot-scope="scope">
                 {{ scope.row.省份 }}
@@ -403,13 +403,20 @@ export default {
         this.dataPeople = tree(data, 0)
       })
       this.getSelect(initCustomer, ['客户名称', '客户流水号'], 'CustomerName')
+      selectMarketingManager(1).then(response => {
+        this.loading3 = false
+        for (let i = 0; i < response.data.length; i++) {
+          response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
+        }
+        this.tableData3 = response.data
+      })
     },
     getCurrentRow(row) {
       this.CustomerNameValue = ''
       this.AdressID = row
       this.getTable(selectCustomer, [this.AdressID, this.pageCurrent, this.pageSize], ['tableData2', 'total', 'loading2'])
       this.loading3 = true
-      selectMarketingManager(this.AdressID).then(response => {
+      selectMarketingManager(1).then(response => {
         this.loading3 = false
         for (let i = 0; i < response.data.length; i++) {
           response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
@@ -450,7 +457,7 @@ export default {
         return this.AdressID
       }).then(data => {
         this.loading3 = false
-        selectMarketingManager(data).then(response => {
+        selectMarketingManager(1).then(response => {
           this.loading3 = false
           for (let i = 0; i < response.data.length; i++) {
             response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
@@ -482,7 +489,7 @@ export default {
     },
     handleDeleteMarketingManager(index, row) {
       function a() {
-        selectMarketingManager(this.AdressID).then(response => {
+        selectMarketingManager(1).then(response => {
           this.loading3 = false
           for (let i = 0; i < response.data.length; i++) {
             response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
@@ -493,13 +500,9 @@ export default {
       this.deleteRow(deleteMarketingManager, row.营销经理地区流水号, a)
     },
     addMarketingManager() {
-      if (this.AdressID === '' || this.AdressID === null) {
-        this.$message.warning('请选择一个省份')
-      } else {
         this.dialogFormVisible1 = true
         this.title1 = '增加'
         this.addForm('form1')
-      }
     },
     callOff1() {
       this.dialogFormVisible1 = false
@@ -508,7 +511,7 @@ export default {
       function a() {
         this.dialogFormVisible1 = false
         this.loading3 = true
-        selectMarketingManager(this.AdressID).then(response => {
+        selectMarketingManager(1).then(response => {
           this.loading3 = false
           for (let i = 0; i < response.data.length; i++) {
             response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
@@ -517,7 +520,7 @@ export default {
         })
       }
       if (this.flag === 1) {
-        this.addTable(addMarketingManager, [this.peopleid, this.AdressID], 'form1', a)
+        this.addTable(addMarketingManager, [this.peopleid, 1], 'form1', a)
       } else {
         this.editTable(editMarketingManager, [this.peopleid, this.a], 'form1', a)
       }