From 215af0c97e4f1d441f13bc1fe4c4d9405fc2740b Mon Sep 17 00:00:00 2001 From: datang Date: Wed, 19 Apr 2023 16:50:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/crm.js | 17 +- src/views/addressBook/index.vue | 2 +- .../bizGoals/components/TaskSetStatistics.vue | 2 +- .../bizParam/components/BusinessGroupSet.vue | 2 +- .../bizParam/components/CustomerLimitSet.vue | 2 +- src/views/admin/crm/customField/index.vue | 2 +- src/views/admin/crm/customer/index.vue | 2 +- src/views/admin/crm/printTemplates/index.vue | 2 +- src/views/admin/employeeDep/index.vue | 2 +- src/views/admin/examine/index.vue | 2 +- src/views/admin/log/DataHandleLog.vue | 2 +- src/views/admin/log/LoginLog.vue | 2 +- src/views/admin/log/SysHandleLog.vue | 2 +- .../admin/oa/components/ExamineManager.vue | 2 +- src/views/admin/project/index.vue | 2 +- src/views/admin/roleAuth/index.vue | 2 +- .../AchievementInvoiceStatistics.vue | 2 +- .../AchievementSummaryStatistics.vue | 2 +- .../bi/customer/CustomerSatisfaction.vue | 2 +- src/views/bi/customer/ProductSatisfaction.vue | 2 +- src/views/bi/oa/Examine.vue | 2 +- src/views/bi/oa/Log.vue | 2 +- src/views/bi/product/ProductStatistics.vue | 2 +- src/views/crm/business/index.vue | 2 +- src/views/crm/components/RelativeBusiness.vue | 2 +- src/views/crm/components/RelativeContacts.vue | 2 +- src/views/crm/components/RelativeContract.vue | 2 +- src/views/crm/components/RelativeFiles.vue | 2 +- src/views/crm/components/RelativeInvoice.vue | 4 +- src/views/crm/components/RelativePrint.vue | 2 +- src/views/crm/components/RelativeProduct.vue | 2 +- .../crm/components/RelativeReturnMoney.vue | 4 +- src/views/crm/components/RelativeTeam.vue | 2 +- src/views/crm/components/RelativeVisit.vue | 2 +- .../crm/components/SceneForm/SceneSet.vue | 5 +- src/views/crm/contacts/index.vue | 2 +- src/views/crm/contract/index.vue | 2 +- src/views/crm/customer/index.vue | 2 +- src/views/crm/invoice/index.vue | 2 +- src/views/crm/leads/index.vue | 2 +- .../crm/message/compenents/CRMMessage.vue | 2 +- src/views/crm/message/index.vue | 191 +++++++++--------- src/views/crm/product/index.vue | 2 +- src/views/crm/receivables/index.vue | 2 +- src/views/crm/seas/index.vue | 2 +- src/views/crm/visit/index.vue | 2 +- .../workbench/components/ReportList/index.vue | 2 +- src/views/pm/archive/index.vue | 2 +- .../pm/project/components/Attachment.vue | 2 +- src/views/workLog/components/LogComDetail.vue | 2 +- 50 files changed, 155 insertions(+), 156 deletions(-) diff --git a/src/store/modules/crm.js b/src/store/modules/crm.js index 9133f1f..a540d3b 100644 --- a/src/store/modules/crm.js +++ b/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(() => {}) + }) } diff --git a/src/views/addressBook/index.vue b/src/views/addressBook/index.vue index e2e51ad..955eab7 100644 --- a/src/views/addressBook/index.vue +++ b/src/views/addressBook/index.vue @@ -28,7 +28,7 @@ diff --git a/src/views/admin/crm/bizParam/components/CustomerLimitSet.vue b/src/views/admin/crm/bizParam/components/CustomerLimitSet.vue index 61455ea..03b6462 100644 --- a/src/views/admin/crm/bizParam/components/CustomerLimitSet.vue +++ b/src/views/admin/crm/bizParam/components/CustomerLimitSet.vue @@ -12,7 +12,7 @@ diff --git a/src/views/admin/crm/customField/index.vue b/src/views/admin/crm/customField/index.vue index 5f49996..b41557b 100644 --- a/src/views/admin/crm/customField/index.vue +++ b/src/views/admin/crm/customField/index.vue @@ -8,7 +8,7 @@ diff --git a/src/views/admin/log/LoginLog.vue b/src/views/admin/log/LoginLog.vue index 12546f5..118a662 100644 --- a/src/views/admin/log/LoginLog.vue +++ b/src/views/admin/log/LoginLog.vue @@ -27,7 +27,7 @@ diff --git a/src/views/admin/oa/components/ExamineManager.vue b/src/views/admin/oa/components/ExamineManager.vue index 48e1238..67d540d 100644 --- a/src/views/admin/oa/components/ExamineManager.vue +++ b/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 diff --git a/src/views/admin/project/index.vue b/src/views/admin/project/index.vue index f48caf9..616a78f 100644 --- a/src/views/admin/project/index.vue +++ b/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%" diff --git a/src/views/admin/roleAuth/index.vue b/src/views/admin/roleAuth/index.vue index 514bd14..36bb4f6 100644 --- a/src/views/admin/roleAuth/index.vue +++ b/src/views/admin/roleAuth/index.vue @@ -94,7 +94,7 @@ diff --git a/src/views/crm/components/RelativeVisit.vue b/src/views/crm/components/RelativeVisit.vue index 4e4ac74..a4629a0 100644 --- a/src/views/crm/components/RelativeVisit.vue +++ b/src/views/crm/components/RelativeVisit.vue @@ -17,7 +17,7 @@ {{ leftCheckItems.length + '/' + checkedLeftData.length }}
-
- + -->
- + 待办事项
-
+
- +
- +
@@ -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: '待审核商机', - crmType: 'business', - color: '#704AFD', - iconClass: 'wk wk-business', - infoType: 'checkBusiness', - model: 13, - 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, + name: '即将到期的合同', + crmType: 'contract', + color: '#FF7A38', + iconClass: 'wk wk-contract', + infoType: 'endContract', + model: 8, 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; } - diff --git a/src/views/crm/product/index.vue b/src/views/crm/product/index.vue index 6c9e9d9..ecc4e7f 100644 --- a/src/views/crm/product/index.vue +++ b/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 diff --git a/src/views/crm/receivables/index.vue b/src/views/crm/receivables/index.vue index 277c833..d04c201 100644 --- a/src/views/crm/receivables/index.vue +++ b/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" diff --git a/src/views/crm/seas/index.vue b/src/views/crm/seas/index.vue index ba933f0..cd6ddb6 100644 --- a/src/views/crm/seas/index.vue +++ b/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 diff --git a/src/views/crm/visit/index.vue b/src/views/crm/visit/index.vue index cc6ee38..5180a71 100644 --- a/src/views/crm/visit/index.vue +++ b/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" diff --git a/src/views/crm/workbench/components/ReportList/index.vue b/src/views/crm/workbench/components/ReportList/index.vue index f7b78b9..5807d4d 100644 --- a/src/views/crm/workbench/components/ReportList/index.vue +++ b/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 diff --git a/src/views/pm/archive/index.vue b/src/views/pm/archive/index.vue index aad44c3..7ee05c5 100644 --- a/src/views/pm/archive/index.vue +++ b/src/views/pm/archive/index.vue @@ -10,7 +10,7 @@