前端修改

Reviewed-on: #1

config/dev.env.js

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

config/index.js

@@ -11,14 +11,15 @@ module.exports = {
         assetsPublicPath: '/',
         proxyTable: {
             '/api': {
-              target: 'http://127.0.0.1/',
+                target: 'http://192.168.50.40:8088',
+
                 changeOrigin: true,
                 pathRewrite: {
                     '^/api': ''
                 }
             },
             '/file': {
-              target: 'http://127.0.0.1/',
+                target: 'http://192.168.50.40:8088/',
                 changeOrigin: true,
                 pathRewrite: {
                     '^/file': ''

config/prod.env.js

@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://company6.dxbs.vip/index.php/"',
+  BASE_API: '"http://web.lbschem.com:8088/index.php/"',
 }

src/permission.js

@@ -11,12 +11,27 @@ import {
 
 let loadAsyncRouter = false
 const whiteList = ['/login', '/welcome'] // 不重定向白名单
+// 获取参数
+function getUrlKey(name, url) {
+  // eslint-disable-next-line no-sparse-arrays
+  return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(url) || [, ''])[1].replace(/\+/g, '%20')) || null
+}
 router.beforeEach((to, from, next) => {
   if (to.meta.disabled) {
     next(false)
     return
   }
   NProgress.start()
+  if (window.location.href.indexOf('authkey') >= 0) {
+    if (!getAuth()) {
+      store.commit('SET_AUTH', {
+        authKey: getUrlKey('authkey', window.location.href),
+        sessionId: getUrlKey('sessionid', window.location.href)
+      })
+    } else {
+      window.location.href = '/'
+    }
+  }
   /** 请求头包含授权信息 并且 页面必须授权 直接进入 */
   if (getAuth()) {
     if (whiteList.includes(to.path)) {

src/store/modules/crm.js

@@ -3,6 +3,9 @@ import {
   crmCustomerNumForC
 } from '@/api/crm/message'
 
+import {
+  adminUsersReadAPI
+} from '@/api/user/personCenter'
 /**
  * 消息记录
  */
@@ -45,6 +48,16 @@ const app = {
       commit
     }) {
       return new Promise((resolve, reject) => {
+        adminUsersReadAPI().then(response => {
+          if (response.data.id == 1) {
+            crmCustomerNumForC().then(res => {
+              commit('SET_CUSTOMERNUM', res.data)
+            }).catch(() => {})
+          }
+        }).catch(error => {
+          reject(error)
+        })
+
         crmMessagNumAPI()
           .then(response => {
             commit('SET_MESSAGENUM', response.data)
@@ -54,9 +67,7 @@ const app = {
           .catch(error => {
             reject(error)
           })
-        crmCustomerNumForC().then(res => {
+
-          commit('SET_CUSTOMERNUM', res.data)
-        }).catch(() => {})
       })
     }
 

src/utils/request.js

@@ -49,11 +49,11 @@ if (window.location.href.indexOf('index.html') != -1) {
 } else {
   hrefs = window.location.href.split('#')
 }
-const baseURL = hrefs.length > 0 ? hrefs[0] : window.location.href
+// const baseURL = hrefs.length > 0 ? hrefs[0] : window.location.href
 // baseURL + 'index.php/' 默认请求地址
 // process.env.BASE_API 自定义请求地址
 
-window.BASE_URL = process.env.NODE_ENV === 'production' ? baseURL + 'index.php/' : process.env.BASE_API
+window.BASE_URL = process.env.BASE_API
 
 const service = axios.create({
   baseURL: window.BASE_URL, // api 的 base_url

src/views/addressBook/index.vue

@@ -28,7 +28,7 @@
       <el-table
         v-loading="loading"
         :data="listData"
-        :height="tableHeight"
+        :height="tableHeight+300"
         stripe
         border
         class="n-table--border"

src/views/admin/crm/bizGoals/components/TaskSetStatistics.vue

@@ -86,7 +86,7 @@
       <el-table
         id="task-set-table"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-style="cellStyle"
         border
         header-align="center"

src/views/admin/crm/bizParam/components/BusinessGroupSet.vue

@@ -11,7 +11,7 @@
     <div class="business-table">
       <el-table
         :data="businessData"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :header-cell-style="headerCellStyle"
         style="width: 100%"
         stripe>

src/views/admin/crm/bizParam/components/CustomerLimitSet.vue

@@ -12,7 +12,7 @@
       <el-table
         v-loading="loading"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :header-cell-style="headerCellStyle"
         style="width: 100%"
         stripe>

src/views/admin/crm/customField/index.vue

@@ -8,7 +8,7 @@
       <el-table
         v-loading="loading"
         :data="tableList"
-        :height="tableHeight"
+        :height="tableHeight+300"
         highlight-current-row
         style="width: 100%">
         <el-table-column

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

@@ -46,8 +46,8 @@
             <div class="row-label">客户类型</div>
             <div class="row-content">
               <el-select
-                v-model="baseFrom.customer_type" multiple filterable allow-create default-first-option
+                v-model="baseFrom.customer_type" :placeholder="placeholderText" multiple filterable allow-create
-                placeholder="请选择客户类型" class="customer_select">
+                default-first-option class="customer_select">
                 <el-option v-for="item in options" :key="item.index" :label="item.index" :value="item" />
               </el-select>
             </div>
@@ -193,6 +193,7 @@ export default {
     }
 
     return {
+      placeholderText: '',
       options: [],
       loading: false,
       baseFrom: null,
@@ -275,6 +276,7 @@ export default {
           item.type = 'user'
         })
       }
+      this.placeholderText = data.customer_type
       this.baseFrom = {
         pool_name: data.pool_name,
         adminUsers: data.admin_user_info,
@@ -344,6 +346,7 @@ export default {
           users: [],
           strucs: []
         },
+        customer_type: '',
         before_owner_conf: 0, // 前负责人领取规则 0不限制 1限制
         before_owner_day: '',
         receive_conf: 0, // 0 不启用 1 启用
@@ -524,7 +527,6 @@ export default {
             params.customer_type = this.baseFrom.customer_type.map(item => {
               return item
             }).join(',')
-            console.log(params.customer_type)
           } else {
             params[key] = this.baseFrom[key]
           }

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

@@ -59,6 +59,12 @@
       </flexbox>
       <create-sections title="规则设置">
         <div class="rule">
+          <flexbox
+            align="stretch"
+            class="rule-item">
+            <div class="label">客户类型</div>
+            <div class="value">{{ detail.customer_type }}</div>
+          </flexbox>
           <flexbox
             align="stretch"
             class="rule-item">

src/views/admin/crm/customer/index.vue

@@ -19,7 +19,7 @@
         v-loading="loading"
         id="examine-table"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         class="main-table"
         highlight-current-row

src/views/admin/crm/printTemplates/index.vue

@@ -19,7 +19,7 @@
         v-loading="loading"
         id="examine-table"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         class="main-table"
         stripe

src/views/admin/employeeDep/index.vue

@@ -150,7 +150,7 @@
             v-loading="loading"
             id="depTable"
             :data="tableData"
-            :height="tableHeight"
+            :height="tableHeight+300"
             @selection-change="handleSelectionChange"
             @row-click="rowClick">
             <el-table-column

src/views/admin/examine/index.vue

@@ -16,7 +16,7 @@
         v-loading="loading"
         id="examine-table"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         class="main-table"
         highlight-current-row

src/views/admin/log/DataHandleLog.vue

@@ -46,7 +46,7 @@
       <el-table
         v-loading="loading"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         class="main-table"
         highlight-current-row
         style="width: 100%">

src/views/admin/log/LoginLog.vue

@@ -27,7 +27,7 @@
       <el-table
         v-loading="loading"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         class="main-table"
         highlight-current-row

src/views/admin/log/SysHandleLog.vue

@@ -38,7 +38,7 @@
       <el-table
         v-loading="loading"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         class="main-table"
         highlight-current-row
         style="width: 100%">

src/views/admin/oa/components/ExamineManager.vue

@@ -11,7 +11,7 @@
       v-loading="loading"
       id="examine-table"
       :data="list"
-      :height="tableHeight"
+      :height="tableHeight+300"
       :cell-class-name="cellClassName"
       class="main-table"
       stripe

src/views/admin/project/index.vue

@@ -19,7 +19,7 @@
         v-loading="loading"
         id="examine-table"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         class="main-table"
         highlight-current-row
         style="width: 100%"

src/views/admin/roleAuth/index.vue

@@ -94,7 +94,7 @@
               </flexbox>
               <el-table
                 :data="tableData"
-                :height="tableHeight"
+                :height="tableHeight+300"
                 style="width: 100%">
                 <el-table-column
                   v-for="(item, index) in tableList"

src/views/bi/achievement/AchievementInvoiceStatistics.vue

@@ -21,7 +21,7 @@
         <el-table
           v-if="showTable"
           :data="list"
-          :height="tableHeight"
+          :height="tableHeight+300"
           stripe
           border
           highlight-current-row

src/views/bi/achievement/AchievementSummaryStatistics.vue

@@ -21,7 +21,7 @@
         <el-table
           v-if="showTable"
           :data="list"
-          :height="tableHeight"
+          :height="tableHeight+300"
           stripe
           border
           highlight-current-row

src/views/bi/customer/CustomerSatisfaction.vue

@@ -17,7 +17,7 @@
       <div class="table-content">
         <el-table
           :data="list"
-          :height="tableHeight"
+          :height="tableHeight+300"
           stripe
           border
           highlight-current-row

src/views/bi/customer/ProductSatisfaction.vue

@@ -17,7 +17,7 @@
       <div class="table-content">
         <el-table
           :data="list"
-          :height="tableHeight"
+          :height="tableHeight+300"
           stripe
           border
           highlight-current-row

src/views/bi/oa/Examine.vue

@@ -18,7 +18,7 @@
         <el-table
           v-if="showTable"
           :data="list"
-          :height="tableHeight"
+          :height="tableHeight+300"
           :cell-style="cellStyle"
           stripe
           border

src/views/bi/oa/Log.vue

@@ -18,7 +18,7 @@
         <el-table
           v-if="showTable"
           :data="list"
-          :height="tableHeight"
+          :height="tableHeight+300"
           stripe
           border
           highlight-current-row

src/views/bi/product/ProductStatistics.vue

@@ -18,7 +18,7 @@
         id="crm-table"
         ref="tableRef"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         :summary-method="getSummaries"
         show-summary

src/views/crm/business/Detail.vue

@@ -164,6 +164,32 @@
         </flexbox>
       </flexbox>
     </div>
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :title="dialogTitle"
+      :modal="false"
+      width="30%">
+      <p>{{ dialogMessage }}：</p>
+      <el-input
+        v-model="commentContent"
+        type="textarea"
+        rows="4"
+        autocomplete="off"
+        placeholder="请输入内容"/>
+      <p>审核人：</p>
+      <el-select
+        v-model="selectValue"
+        :clearable="true"
+        :filterable="true"
+        placeholder="请选择"
+      >
+        <el-option v-for="(item) in userOptions" :key="item.id" :value="item.id" :label="item.username"/>
+      </el-select>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogConfirm()">确 定</el-button>
+      </span>
+    </el-dialog>
 
     <el-button
       class="firse-button"
@@ -248,7 +274,13 @@ export default {
   data() {
     return {
       // 展示加载loading
+      dialogVisible: false,
+      dialogTitle: '',
+      dialogMessage: '',
+      dialogData: {},
+      commentContent: '',
       userOptions: [],
+      selectValue: '',
       value: '',
       inputValue: '',
       loading: false,
@@ -599,147 +631,34 @@ export default {
         // 非完结状态下 可推进
         return
       }
+      this.dialogVisible = true
+      this.dialogData = item
       /** 输单 和 无效 */
       if (item.type == 2 || item.type == 3) {
-        var message = '请填写' + item.name + '原因:'
+        this.dialogTitle = item.name + '原因'
-        var title = item.name + '原因'
+        this.dialogMessage = '请填写' + item.name + '原因:'
-
-        const h = this.$createElement
-        const msgBoxContent = h('div', [
-          h('p', message),
-          h('textarea', {
-            attrs: {
-              class: 'el-textarea__inner',
-              autocomplete: 'off',
-              rows: 4,
-              id: 'commentContent'
-            },
-            domProps: {
-              value: this.commentContent
-            },
-            on: { input: v => {
-              this.commentContent = v.target.value
-            } }
-          }),
-          h('p', '审核人:'),
-          h('el-select', {
-            ref: 'selectView',
-            props: {
-              clearable: true,
-              filterable: true,
-              placeholder: '请选择',
-              value: this.value
-            },
-            on: {
-              input: val => {
-                this.value = val
-                // console.log(val)
-              },
-              change: e => {
-                this.value = e
-                this.$refs['selectView'].value = e
-              }
-            }
-          }, this.userOptions.map(option => {
-            return h('el-option', {
-              props: {
-                value: option.id,
-                label: option.username
-              }
-            })
-          }))
-        ])
-        this.$msgbox({
-          title: title,
-          message: msgBoxContent,
-          showCancelButton: true,
-          confirmButtonText: '确定',
-          cancelButtonText: '取消'
-        })
-          .then(({ value }) => {
-            this.loading = true
-            const commentContent = document.getElementById('commentContent').value
-            crmBusinessAdvanceAPI({
-              check_user_id: this.$refs['selectView'].value,
-              business_id: this.id,
-              status_id: item.status_id,
-              is_end: item.type,
-              statusRemark: commentContent
-            })
-              .then(res => {
-                this.loading = false
-                this.$message.success('操作成功')
-                this.getDetial()
-              })
-              .catch(() => {
-                this.loading = false
-              })
-          })
-          .catch(() => {})
       } else {
-        var title = item.name
+        this.dialogTitle = item.name
-        const h = this.$createElement
-        const msgBoxContent = h('div', [
-          h('p', '审核人:'),
-          h('el-select', {
-            ref: 'selectView',
-            props: {
-              clearable: true,
-              filterable: true,
-              placeholder: '请选择',
-              value: this.value
-            },
-            on: {
-              input: val => {
-                this.value = val
-                // console.log(val)
-              },
-              change: e => {
-                this.value = e
-                this.$refs['selectView'].value = e
-              }
-            }
-          }, this.userOptions.map(option => {
-            return h('el-option', {
-              props: {
-                value: option.id,
-                label: option.username
       }
-            })
+    },
-          }))
+    dialogConfirm() {
-        ])
-        this.$msgbox({
-          title: title,
-          message: msgBoxContent,
-          showCancelButton: true,
-          confirmButtonText: '确定',
-          cancelButtonText: '取消'
-        })
-          .then(() => {
-            this.isContract = true
-            this.createClick()
       this.loading = true
       crmBusinessAdvanceAPI({
-              check_user_id: this.$refs['selectView'].value,
+        check_user_id: this.selectValue,
         business_id: this.id,
-              status_id: item.status_id,
+        status_id: this.dialogData.status_id,
-              is_end: item.type
+        is_end: this.dialogData.type,
+        statusRemark: this.commentContent
       })
         .then(res => {
           this.loading = false
           this.$message.success('操作成功')
+          this.dialogVisible = false
           this.getDetial()
         })
         .catch(() => {
           this.loading = false
         })
-
-            // this.crmType = 'contract'
-            // this.action.type = 'save'
-            // this.createClick()
-          })
-          .catch(() => {})
-      }
     },
     /**
      * 审核操作

src/views/crm/business/index.vue

@@ -27,7 +27,7 @@
         id="crm-table"
         :row-height="40"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         :header-cell-class-name="headerCellClassName"
         class="n-table--border"

src/views/crm/components/RelativeBusiness.vue

@@ -48,7 +48,7 @@
     </flexbox>
     <el-table
       :data="list"
-      :height="tableHeight"
+      :height="tableHeight+300"
       :cell-class-name="cellClassName"
       stripe
       style="width: 100%;border: 1px solid #E6E6E6;"

src/views/crm/components/RelativeContacts.vue

@@ -49,7 +49,7 @@
     <el-table
       v-show="fieldList.length > 0"
       :data="list"
-      :height="tableHeight"
+      :height="tableHeight+300"
       :cell-class-name="cellClassName"
       stripe
       style="width: 100%;border: 1px solid #E6E6E6;"
@@ -67,6 +67,10 @@
         :prop="item.prop"
         :label="item.label"
         show-overflow-tooltip />
+      <el-table-column
+        label="微信账号"
+        prop="crm_lnxvis"
+        width="100" />
       <el-table-column
         label="操作"
         width="100">
@@ -248,7 +252,7 @@ export default {
         label: '姓名'
       })
       this.fieldList.push({ prop: 'mobile', width: '200', label: '手机' })
-      this.fieldList.push({ prop: 'post', width: '200', label: '职务' })
+      this.fieldList.push({ prop: 'crm_mlffgs', width: '200', label: '职务' })
     },
 
     /**

src/views/crm/components/RelativeContract.vue

@@ -17,7 +17,7 @@
     </flexbox>
     <el-table
       :data="list"
-      :height="tableHeight"
+      :height="tableHeight+300"
       :cell-class-name="cellClassName"
       stripe
       style="width: 100%;border: 1px solid #E6E6E6;"

src/views/crm/components/RelativeFiles.vue

@@ -18,7 +18,7 @@
     </flexbox>
     <el-table
       :data="list"
-      :height="tableHeight"
+      :height="tableHeight+300"
       class="file-table"
       stripe
       style="width: 100%;border: 1px solid #E6E6E6;"

src/views/crm/components/RelativeInvoice.vue

@@ -12,7 +12,7 @@
     </flexbox>
     <el-table
       :data="titleList"
-      :height="tableHeight"
+      :height="tableHeight+300"
       stripe
       style="width: 100%;border: 1px solid #E6E6E6;">
       <el-table-column
@@ -53,7 +53,7 @@
     </flexbox>
     <el-table
       :data="list"
-      :height="tableHeight"
+      :height="tableHeight+300"
       :cell-class-name="cellClassName"
       stripe
       style="width: 100%;border: 1px solid #E6E6E6;"

src/views/crm/components/RelativePrint.vue

@@ -8,7 +8,7 @@
     <el-table
       v-show="fieldList.length > 0"
       :data="list"
-      :height="tableHeight"
+      :height="tableHeight+300"
       stripe
       style="width: 100%;border: 1px solid #E6E6E6;">
       <el-table-column

src/views/crm/components/RelativeProduct.vue

@@ -10,7 +10,7 @@
       direction="row-reverse"/>
     <el-table
       :data="list"
-      :height="tableHeight"
+      :height="tableHeight+300"
       :cell-class-name="cellClassName"
       stripe
       style="width: 100%;border: 1px solid #E6E6E6;"

src/views/crm/components/RelativeReturnMoney.vue

@@ -12,7 +12,7 @@
     </flexbox>
     <el-table
       :data="palnList"
-      :height="tableHeight"
+      :height="tableHeight+300"
       stripe
       style="width: 100%;border: 1px solid #E6E6E6;">
       <el-table-column
@@ -51,7 +51,7 @@
     </flexbox>
     <el-table
       :data="list"
-      :height="tableHeight"
+      :height="tableHeight+300"
       :cell-class-name="cellClassName"
       stripe
       style="width: 100%;border: 1px solid #E6E6E6;"

src/views/crm/components/RelativeTeam.vue

@@ -27,7 +27,7 @@
     </flexbox>
     <el-table
       :data="list"
-      :height="tableHeight"
+      :height="tableHeight+300"
       stripe
       style="width: 100%;border: 1px solid #E6E6E6;"
       @selection-change="handleSelectionChange">

src/views/crm/components/RelativeVisit.vue

@@ -17,7 +17,7 @@
     <el-table
       v-show="fieldList.length > 0"
       :data="list"
-      :height="tableHeight"
+      :height="tableHeight+300"
       :cell-class-name="cellClassName"
       stripe
       style="width: 100%;border: 1px solid #E6E6E6;"

src/views/crm/components/SceneForm/SceneSet.vue

@@ -18,7 +18,7 @@
           <div class="scene-list-head-detail">{{ leftCheckItems.length + '/' + checkedLeftData.length }}</div>
         </flexbox>
         <div class="scene-list-body">
-          <flexbox
+          <!-- <flexbox
             v-for="(item, index) in checkedLeftData"
             v-if="item.type == 1"
             :key="index"
@@ -44,7 +44,7 @@
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
-          </flexbox>
+          </flexbox> -->
           <draggable
             v-model="checkedLeftData"
             :move="leftMove"
@@ -53,7 +53,6 @@
             @end="leftMoveEnd">
             <flexbox
               v-for="(item, index) in checkedLeftData"
-              v-if="item.type != 1"
               :key="index"
               class="list-item">
               <div

src/views/crm/contacts/index.vue

@@ -27,7 +27,7 @@
         id="crm-table"
         :row-height="40"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         :header-cell-class-name="headerCellClassName"
         class="n-table--border"

src/views/crm/contract/index.vue

@@ -27,7 +27,7 @@
         id="crm-table"
         :row-height="40"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         :header-cell-class-name="headerCellClassName"
         class="n-table--border"

src/views/crm/customer/index.vue

@@ -43,7 +43,7 @@
         id="crm-table"
         :row-height="50"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         class="n-table--border"
         use-virtual

src/views/crm/invoice/index.vue

@@ -28,7 +28,7 @@
         id="crm-table"
         :row-height="40"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         :header-cell-class-name="headerCellClassName"
         use-virtual

src/views/crm/leads/index.vue

@@ -43,7 +43,7 @@
         id="crm-table"
         :row-height="40"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         class="n-table--border"
         use-virtual

src/views/crm/message/compenents/CRMMessage.vue

@@ -79,7 +79,7 @@
       v-loading="loading"
       id="crm-table"
       :data="list"
-      :height="tableHeight"
+      :height="tableHeight+300"
       :cell-class-name="cellClassName"
       class="n-table--border"
       stripe

src/views/crm/message/index.vue

@@ -1,38 +1,19 @@
 <template>
   <div style="height:100%;">
-    <flexbox class="message-header"><img
+    <flexbox class="message-header"><img src="@/assets/img/crm/todo.png" class="title-icon">
-      src="@/assets/img/crm/todo.png"
-      class="title-icon">
       <span class="title">待办事项</span>
     </flexbox>
     <div class="message-body">
-      <div
+      <div v-loading="loading" class="message-content">
-        v-loading="loading"
-        class="message-content">
         <div class="message-body-side">
-          <xr-menu-item
+          <xr-menu-item v-for="(item, index) in showLeftSides" :key="index" :label="item.name" :num="item.num"
-            v-for="(item, index) in showLeftSides"
+            :icon-class="item.iconClass" :icon-color="item.color" :select="leftType == item.infoType"
-            :key="index"
+            @click.native="sideClick(item)" />
-            :label="item.name"
-            :num="item.num"
-            :icon-class="item.iconClass"
-            :icon-color="item.color"
-            :select="leftType==item.infoType"
-            @click.native="sideClick(item)"/>
         </div>
         <div class="message-body-content">
-          <c-r-m-message
+          <c-r-m-message v-for="(item, index) in showLeftSides" v-show="leftType == item.infoType" :key="index"
-            v-for="(item, index) in showLeftSides"
+            :crm-type="item.crmType" :info-type="item.infoType" :info-title="item.name" :info-tips="item.tips"
-            v-show="leftType==item.infoType"
+            :model="item.model" :show="leftType == item.infoType" :icon-data="item" @on-handle="messageHandle" />
-            :key="index"
-            :crm-type="item.crmType"
-            :info-type="item.infoType"
-            :info-title="item.name"
-            :info-tips="item.tips"
-            :model="item.model"
-            :show="leftType==item.infoType"
-            :icon-data="item"
-            @on-handle="messageHandle"/>
         </div>
       </div>
     </div>
@@ -62,17 +43,6 @@ export default {
        * model 1今日需联系客户 2分配给我的线索 3分配给我的客户 4待进入公海的客户 5待审核合同 6待审核回款 7待回款提醒 8即将到期的合同 9待回访合同 10待审核发票 13待审核商机 14新商机
        */
       leftSides: [
-        {
-          name: '今日需联系线索',
-          crmType: 'leads',
-          color: '#2362FB',
-          iconClass: 'wk wk-leads',
-          infoType: 'todayLeads',
-          model: 11,
-          num: 0,
-          tips: '下次跟进时间为今日的线索',
-          hidden: true
-        },
         {
           name: '今日需联系客户',
           crmType: 'customer',
@@ -95,17 +65,6 @@ export default {
           tips: '下次跟进时间为今日的商机',
           hidden: true
         },
-        {
-          name: '分配给我的线索',
-          crmType: 'leads',
-          color: '#704AFD',
-          iconClass: 'wk wk-leads',
-          infoType: 'followLeads',
-          model: 2,
-          num: 0,
-          tips: '转移之后未跟进的线索',
-          hidden: true
-        },
         {
           name: '分配给我的客户',
           crmType: 'customer',
@@ -128,6 +87,50 @@ export default {
           tips: '',
           hidden: true
         },
+        {
+          name: '待回访合同',
+          crmType: 'contract',
+          color: '#ff9232',
+          iconClass: 'wk wk-house',
+          infoType: 'returnVisitRemind',
+          model: 9,
+          num: 0,
+          tips: '',
+          hidden: true
+        },
+        {
+          name: '新商机',
+          crmType: 'business',
+          color: '#704AFD',
+          iconClass: 'wk wk-business',
+          infoType: 'newBusiness',
+          model: 14,
+          num: 0,
+          tips: '',
+          hidden: true
+        },
+        {
+          name: '待审核商机',
+          crmType: 'business',
+          color: '#704AFD',
+          iconClass: 'wk wk-business',
+          infoType: 'checkBusiness',
+          model: 13,
+          num: 0,
+          tips: '',
+          hidden: true
+        },
+        {
+          name: '审批客户捞取',
+          crmType: 'customer',
+          color: '#704AFD',
+          iconClass: 'wk wk-customer',
+          infoType: 'checkCustomerCheck',
+          model: 15,
+          num: 0,
+          tips: '',
+          hidden: true
+        },
         {
           name: '待审核合同',
           crmType: 'contract',
@@ -139,6 +142,31 @@ export default {
           tips: '',
           hidden: true
         },
+        {
+          name: '今日需联系线索',
+          crmType: 'leads',
+          color: '#2362FB',
+          iconClass: 'wk wk-leads',
+          infoType: 'todayLeads',
+          model: 11,
+          num: 0,
+          tips: '下次跟进时间为今日的线索',
+          hidden: true
+        },
+        {
+          name: '分配给我的线索',
+          crmType: 'leads',
+          color: '#704AFD',
+          iconClass: 'wk wk-leads',
+          infoType: 'followLeads',
+          model: 2,
+          num: 0,
+          tips: '转移之后未跟进的线索',
+          hidden: true
+        },
+
+
+
         {
           name: '待审核回款',
           crmType: 'receivables',
@@ -161,28 +189,6 @@ export default {
           tips: '',
           hidden: true
         },
-        {
-          name: '即将到期的合同',
-          crmType: 'contract',
-          color: '#FF7A38',
-          iconClass: 'wk wk-contract',
-          infoType: 'endContract',
-          model: 8,
-          num: 0,
-          tips: '根据“合同到期时间”及设置的“提前提醒天数”提醒',
-          hidden: true
-        },
-        {
-          name: '待回访合同',
-          crmType: 'contract',
-          color: '#ff9232',
-          iconClass: 'wk wk-house',
-          infoType: 'returnVisitRemind',
-          model: 9,
-          num: 0,
-          tips: '',
-          hidden: true
-        },
         {
           name: '待审核发票',
           crmType: 'invoice',
@@ -195,36 +201,14 @@ export default {
           hidden: true
         },
         {
-          name: '待审核商机',
+          name: '即将到期的合同',
-          crmType: 'business',
+          crmType: 'contract',
-          color: '#704AFD',
+          color: '#FF7A38',
-          iconClass: 'wk wk-business',
+          iconClass: 'wk wk-contract',
-          infoType: 'checkBusiness',
+          infoType: 'endContract',
-          model: 13,
+          model: 8,
-          num: 0,
-          tips: '',
-          hidden: true
-        },
-        {
-          name: '新商机',
-          crmType: 'business',
-          color: '#704AFD',
-          iconClass: 'wk wk-business',
-          infoType: 'newBusiness',
-          model: 14,
-          num: 0,
-          tips: '',
-          hidden: true
-        },
-        {
-          name: '审批客户捞取',
-          crmType: 'customer',
-          color: '#704AFD',
-          iconClass: 'wk wk-customer',
-          infoType: 'checkCustomerCheck',
-          model: 15,
           num: 0,
-          tips: '',
+          tips: '根据“合同到期时间”及设置的“提前提醒天数”提醒',
           hidden: true
         }
       ]
@@ -318,6 +302,7 @@ export default {
 .message-header {
   margin-left: 28px;
   height: 60px;
+
   .title-icon {
     width: 30px;
     height: 30px;
@@ -329,11 +314,13 @@ export default {
     font-weight: 600;
   }
 }
+
 .message-body {
   position: relative;
   height: calc(100% - 75px);
   padding-left: 15px;
 }
+
 .message-content {
   position: relative;
   height: 100%;
@@ -352,6 +339,7 @@ export default {
   border: 1px solid $xr-border-line-color;
   border-radius: $xr-border-radius-base;
   overflow-y: auto;
+
   .side-item {
     position: relative;
     height: 50px;
@@ -359,11 +347,13 @@ export default {
     padding: 0 20px;
     font-size: 13px;
     cursor: pointer;
+
     i {
       color: #999;
     }
   }
 }
+
 .message-body-content {
   margin-left: 210px;
   height: 100%;
@@ -372,5 +362,4 @@ export default {
   border: 1px solid #e6e6e6;
   border-radius: $xr-border-radius-base;
 }
-
 </style>

src/views/crm/product/index.vue

@@ -27,7 +27,7 @@
         id="crm-table"
         :row-height="40"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         class="n-table--border"
         use-virtual

src/views/crm/receivables/index.vue

@@ -27,7 +27,7 @@
         id="crm-table"
         :row-height="40"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         :header-cell-class-name="headerCellClassName"
         class="n-table--border"

src/views/crm/seas/index.vue

@@ -59,7 +59,7 @@
         id="crm-table"
         :row-height="40"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         class="n-table--border"
         use-virtual

src/views/crm/visit/index.vue

@@ -28,7 +28,7 @@
         id="crm-table"
         :row-height="40"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :cell-class-name="cellClassName"
         :header-cell-class-name="headerCellClassName"
         class="n-table--border"

src/views/crm/workbench/components/ReportList/index.vue

@@ -34,7 +34,7 @@
             id="crm-table"
             ref="crmTable"
             :data="list"
-            :height="tableHeight"
+            :height="tableHeight+300"
             :cell-class-name="cellClassName"
             stripe
             border

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

@@ -150,11 +150,11 @@ export default {
     },
     getWin() {
       console.log('aa' + this.dataList)
-      this.$emit('chart-click', [], this.dataList[4])
+      this.$emit('chart-click', [], this.dataList[2])
     },
     getLose() {
       console.log('aa' + this.dataList)
-      this.$emit('chart-click', [], this.dataList[5])
+      this.$emit('chart-click', [], this.dataList[3])
     },
     /**
      * 获取统计数据

src/views/layout/components/Navbar.vue

@@ -162,11 +162,6 @@ export default {
         divided: false,
         label: '基本信息',
         icon: 'wk wk-user'
-      }, {
-        command: 'help',
-        divided: true,
-        label: '帮助中心',
-        icon: 'wk wk-help'
       }, {
         command: 'logOut',
         divided: false,

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

@@ -55,9 +55,6 @@
       :style="{ 'background-color':variables.menuBg }"
       class="sidebar-bottom">
       <div class="sidebar-bottom-content">
-        <div v-if="!collapse" class="copyright">
-          <img src="@/assets/img/favicon.png" width="20px" >
-        </div>
         <img
           :style="{ 'right': buttonCollapse ? '3px' : '0' }"
           :class="{ 'is-close': collapse }"
@@ -171,12 +168,14 @@ export default {
   background-color: $menuBg;
   overflow: auto;
   flex-shrink: 0;
+  padding: 0 5px;
 
   .scrollbar-wrapper {
     overflow-x: hidden !important;
   }
 
   .el-scrollbar {
+    margin: 0 5px;
     height: 100%;
   }
 

src/views/pm/archive/index.vue

@@ -10,7 +10,7 @@
       <el-table
         id="crm-table"
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         class="n-table--border"
         stripe
         highlight-current-row

src/views/pm/project/components/Attachment.vue

@@ -5,7 +5,7 @@
     <div class="attachment-body">
       <el-table
         :data="list"
-        :height="tableHeight"
+        :height="tableHeight+300"
         :header-cell-style="headerRowStyle"
         :cell-style="cellStyle"
         align="center"

src/views/workLog/components/LogComDetail.vue

@@ -28,7 +28,7 @@
         v-loading="loading"
         :data="list"
         :cell-class-name="cellClassName"
-        :height="tableHeight"
+        :height="tableHeight+300"
         stripe
         border
         highlight-current-row