From c8ae1f21b3c4f8ed22deb7daefbed7c7464f236d Mon Sep 17 00:00:00 2001
From: yang <yarui@qq.com>
Date: Thu, 18 Mar 2021 11:27:03 +0800
Subject: [PATCH] v11.0.2

---
 package.json                                  |   2 +-
 src/App.vue                                   |  17 ++-
 src/api/bi/business.js                        |  15 +-
 src/api/bi/customer.js                        |  18 +--
 src/api/common.js                             |   2 +-
 src/api/pm/project.js                         |   2 +-
 src/api/pm/task.js                            |   2 +-
 src/api/task/task.js                          |   2 +-
 src/assets/img/favicon.png                    | Bin 0 -> 67646 bytes
 src/components/RelatedBusiness.vue            |   2 +-
 src/components/XrUpgradeDialog.vue            | 139 ++++++++++++++++++
 src/config.js                                 |   4 +-
 src/views/bi/TaskCompleteStatistics.vue       |   4 +-
 .../achievement/AchievementBackStatistics.vue |   4 +-
 .../AchievementCountStatistics.vue            |   4 +-
 .../AchievementInvoiceStatistics.vue          |   4 +-
 .../AchievementMoneyStatistics.vue            |   4 +-
 .../AchievementSummaryStatistics.vue          |   4 +-
 .../bi/business/BusinessWinStatistics.vue     |   5 +-
 .../bi/components/FiltrateHandleView.vue      |   6 +-
 .../bi/customer/CustomerPoolStatistics.vue    |   4 +-
 .../customer/CustomerRecordModeStatistics.vue |   4 +-
 .../bi/customer/CustomerRecordStatistics.vue  |   4 +-
 .../bi/customer/CustomerSatisfaction.vue      |   4 +-
 .../bi/customer/CustomerTotalStatistics.vue   |   4 +-
 src/views/bi/customer/ProductSatisfaction.vue |   4 +-
 .../bi/customer/components/CycleView.vue      |   4 +-
 src/views/bi/oa/Examine.vue                   |   4 +-
 src/views/bi/oa/Log.vue                       |   4 +-
 src/views/bi/product/ProductStatistics.vue    |   4 +-
 .../ranking/RankingAddContactsStatistics.vue  |   4 +-
 .../ranking/RankingAddCustomerStatistics.vue  |   4 +-
 .../bi/ranking/RankingContractStatistics.vue  |   4 +-
 .../bi/ranking/RankingExamineStatistics.vue   |   4 +-
 .../bi/ranking/RankingProductStatistics.vue   |   4 +-
 .../ranking/RankingReceivablesStatistics.vue  |   4 +-
 .../RankingRecordCustomerStatistics.vue       |   4 +-
 .../bi/ranking/RankingRecordNunStatistics.vue |   4 +-
 .../bi/ranking/RankingSigningStatistics.vue   |   4 +-
 src/views/crm/business/Detail.vue             |   2 +
 .../crm/components/Activity/LogEditDialog.vue |   2 +
 src/views/crm/components/CRMEditBaseInfo.vue  |  55 +++----
 .../crm/components/DuplicateCheck/index.vue   |   4 +-
 src/views/crm/components/FilterForm/index.vue |   3 +-
 src/views/crm/components/RelativeProduct.vue  |   4 +-
 src/views/crm/contacts/Detail.vue             |   2 +
 src/views/crm/contract/Detail.vue             |   1 +
 src/views/crm/customer/Detail.vue             |   1 +
 src/views/crm/invoice/Detail.vue              |   1 +
 src/views/crm/leads/Create.vue                |   2 +-
 src/views/crm/leads/Detail.vue                |   1 +
 .../crm/message/compenents/CRMMessage.vue     |   2 +-
 src/views/crm/mixins/Table.js                 |   2 +-
 src/views/crm/product/Detail.vue              |   1 +
 src/views/crm/receivables/Detail.vue          |   2 +
 src/views/crm/visit/Detail.vue                |   1 +
 .../workbench/components/DataStatistics.vue   |   2 +-
 .../crm/workbench/components/chartMixins.js   |   8 +-
 src/views/crm/workbench/index.vue             |   2 +-
 src/views/layout/components/MessageCell.vue   |  24 +--
 src/views/layout/components/Sidebar/index.vue |   2 +-
 src/views/oa/journal/NewDialog.vue            |  26 ++++
 src/views/pm/components/TaskImport.vue        |  99 ++++++++++---
 src/views/pm/project/Corver.vue               |   5 +-
 src/views/pm/project/index.vue                |  10 +-
 src/views/pm/task/index.vue                   |   5 +-
 src/views/workLog/index.vue                   |  16 +-
 static/client.js                              |  40 +++++
 static/img/logo.png                           | Bin 0 -> 3132 bytes
 69 files changed, 482 insertions(+), 159 deletions(-)
 create mode 100644 src/assets/img/favicon.png
 create mode 100644 src/components/XrUpgradeDialog.vue
 create mode 100644 static/img/logo.png

diff --git a/package.json b/package.json
index f8fa4ea..220f2d1 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "nprogress": "0.2.0",
     "numeral": "^2.0.6",
     "nzh": "^1.0.4",
-    "pinyin-match": "^1.0.9",
+    "pinyin-match": "1.0.9",
     "qrcodejs2": "0.0.2",
     "throttle-debounce": "^2.1.0",
     "vue": "2.5.17",
diff --git a/src/App.vue b/src/App.vue
index 87a672b..c403f60 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,6 +18,7 @@
       :cache-done="cacheDone"
       @status="crmImportChange"
       @close="crmImportClose"/>
+    <xr-upgrade-dialog v-if="upgradeDialogShow" :visible.sync="upgradeDialogShow" />
   </div>
 </template>
 
@@ -26,6 +27,7 @@
 import VuePictureViewer from '@/components/VuePictureViewer/index'
 import XrImport from '@/components/XrImport'
 import XrImportMixins from '@/components/XrImport/XrImportMixins'
+import XrUpgradeDialog from '@/components/XrUpgradeDialog'
 import CRMImport from '@/components/CRMImport'
 import { mapGetters } from 'vuex'
 import cache from '@/utils/cache'
@@ -36,22 +38,31 @@ export default {
   components: {
     VuePictureViewer,
     XrImport,
-    CRMImport
+    CRMImport,
+    XrUpgradeDialog
   },
   mixins: [XrImportMixins],
   data() {
     return {
       showPreviewImg: false,
       previewIndex: 0,
-      previewImgs: []
+      previewImgs: [],
+      upgradeDialogShow: false
     }
   },
   computed: {
-    ...mapGetters(['activeIndex', 'userInfo'])
+    ...mapGetters(['activeIndex', 'addRouters', 'userInfo'])
   },
   watch: {
     $route(to, from) {
       this.showPreviewImg = false // 切换页面隐藏图片预览
+    },
+    addRouters() {
+      if (this.userInfo && this.userInfo.is_read_notice != 1) {
+        setTimeout(() => {
+          this.upgradeDialogShow = true
+        }, 5000)
+      }
     }
   },
   mounted() {
diff --git a/src/api/bi/business.js b/src/api/bi/business.js
index e16d056..ff5bfe6 100644
--- a/src/api/bi/business.js
+++ b/src/api/bi/business.js
@@ -33,7 +33,20 @@ export function biBusinessTrendListAPI(data) {
     }
   })
 }
-
+/**
+ * 新增商机数与金额趋势分析 详情列表
+ * @param {*} data
+ */
+export function biBusinessConversionRateListAPI(data) {
+  return request({
+    url: 'bi/business/winList',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
 /**
  * 赢单机会转化率趋势分析
  * @param {*} data
diff --git a/src/api/bi/customer.js b/src/api/bi/customer.js
index ebba259..bc9866c 100644
--- a/src/api/bi/customer.js
+++ b/src/api/bi/customer.js
@@ -27,7 +27,7 @@ export function biCustomerTotalListAPI(data) {
 
 export function biCustomerTotalListExportAPI(data) {
   return request({
-    url: 'bi/contract/excelExport',
+    url: 'bi/customer/excelExport',
     method: 'post',
     data: data,
     responseType: 'blob',
@@ -69,7 +69,7 @@ export function biCustomerRecordListAPI(data) {
 
 export function biCustomerRecordListExportAPI(data) {
   return request({
-    url: 'bi/contract/excelExport',
+    url: 'bi/customer/excelExport',
     method: 'post',
     data: data,
     responseType: 'blob',
@@ -96,7 +96,7 @@ export function biCustomerRecordModeAPI(data) {
 
 export function biCustomerRecordModeExportAPI(data) {
   return request({
-    url: 'bi/contract/excelExport',
+    url: 'bi/customer/excelExport',
     method: 'post',
     data: data,
     responseType: 'blob',
@@ -169,7 +169,7 @@ export function biCustomerPoolListAPI(data) {
 
 export function biCustomerPoolListExportAPI(data) {
   return request({
-    url: 'bi/contract/excelExport',
+    url: 'bi/customer/excelExport',
     method: 'post',
     data: data,
     responseType: 'blob',
@@ -196,7 +196,7 @@ export function biCustomerUserCycleAPI(data) {
 
 export function biCustomerUserCycleExportAPI(data) {
   return request({
-    url: 'bi/contract/excelExport',
+    url: 'bi/customer/excelExport',
     method: 'post',
     data: data,
     responseType: 'blob',
@@ -234,7 +234,7 @@ export function biCustomerAddressCycleAPI(data) {
 
 export function biCustomerAddressCycleExportAPI(data) {
   return request({
-    url: 'bi/contract/excelExport',
+    url: 'bi/customer/excelExport',
     method: 'post',
     data: data,
     responseType: 'blob',
@@ -261,7 +261,7 @@ export function biCustomerProductCycleAPI(data) {
 
 export function biCustomerProductCycleExportAPI(data) {
   return request({
-    url: 'bi/contract/excelExport',
+    url: 'bi/customer/excelExport',
     method: 'post',
     data: data,
     responseType: 'blob',
@@ -288,7 +288,7 @@ export function biCustomerSatisfactionTableAPI(data) {
 
 export function biCustomerSatisfactionTableExportAPI(data) {
   return request({
-    url: 'bi/contract/excelExport',
+    url: 'bi/customer/excelExport',
     method: 'post',
     data: data,
     responseType: 'blob',
@@ -315,7 +315,7 @@ export function biCustomerProductSatisfactionTableAPI(data) {
 
 export function biCustomerProductSatisfactionExportAPI(data) {
   return request({
-    url: 'bi/contract/excelExport',
+    url: 'bi/customer/excelExport',
     method: 'post',
     data: data,
     responseType: 'blob',
diff --git a/src/api/common.js b/src/api/common.js
index f0c616b..3681670 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -354,7 +354,7 @@ export function downloadFileImageAPI(data) {
  */
 export function readUpdateNoticeAPI(data) {
   return request({
-    url: 'adminUser/readNotice',
+    url: 'admin/adminUser/readNotice',
     method: 'post',
     data: data
   })
diff --git a/src/api/pm/project.js b/src/api/pm/project.js
index 3193667..1dbf1a1 100644
--- a/src/api/pm/project.js
+++ b/src/api/pm/project.js
@@ -363,7 +363,7 @@ export function workExcelImportAPI(data) {
  */
 export function workDownloadErrorExcelAPI(data) {
   return request({
-    url: 'work/work/downloadErrorExcel',
+    url: 'admin/file/download',
     method: 'post',
     data: data,
     responseType: 'blob'
diff --git a/src/api/pm/task.js b/src/api/pm/task.js
index 300ddb8..10f7349 100644
--- a/src/api/pm/task.js
+++ b/src/api/pm/task.js
@@ -137,7 +137,7 @@ export function workTaskRecoverAPI(data) {
  */
 export function taskWorkbenchExportAPI(data) {
   return request({
-    url: 'oa/task/excelExport',
+    url: 'work/task/excelExport',
     method: 'post',
     data: data,
     responseType: 'blob'
diff --git a/src/api/task/task.js b/src/api/task/task.js
index 5b60224..e89d9f2 100644
--- a/src/api/task/task.js
+++ b/src/api/task/task.js
@@ -134,7 +134,7 @@ export function taskDeleteLabelAPI(data) {
  */
 export function taskOaExportAPI(data) {
   return request({
-    url: 'work/task/excelExport',
+    url: 'oa/task/excelExport',
     method: 'post',
     data: data,
     responseType: 'blob',
diff --git a/src/assets/img/favicon.png b/src/assets/img/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb3b54605ee12645784326e94d54ffeec25fef1c
GIT binary patch
literal 67646
zcmeI5O^9Vz5y#(<MO+Au8yC9Ba~A|*L=cqVv>>9pcBRX9<#ycYGCd33YJ;v-aIb?B
zh%VBd1Pn;jb`ktoqz4s(5S$S)!Nff4cl*`r^UkX}ANT9s_quPmbMHC#-gBzzU#Cu0
zo%1@g*)93+_;@D&&Sy`*@7C-?v)SxvIi-rqrk>lTaCx)0|K584b8|Tl<h(EEiJWK4
z^RZkPg(vUoceFuUv^n2f!R;txOI*MQylOBm)rI&y)s03cc2sOTOEzOr&U;I|V{Eon
zM)#m;zO#azFyY8`Dc^IsZVThmexdP37kbbqk>jD94|V`^PdA|bum@3Gn<hkFx8-E~
zJe1RuYp428eCFlF=f3pH+DY9|{VjQcr`y*C$Vx_$jhy&YkL7HQ#Ros~s|MF^eCxHv
z_kQsD;`F6A7r+0*zZSIz-|#JM&=&ea+g)f|@&=DLda%?FWFcp3+&}uU7ZzXp`uXBV
zKl$6@;^BX4VXl6kKIn@+>04-TbE4zdUJpbDhjKowl_9p8aXALwIR$|RXlXfr!27lH
z4}@p@`Li0_8EePi`O73Q_jCeXfW{Vf0a?r|r_7yvUHH6TgFEx?&wlZSC-UO@7hZgG
zq37|p|GcnHea^M(0nN}}!z;4cNl*)j7Ty^1=cV#ser;pl!S1`?e|>Qz-yeLjTK*e&
z(FSeNW*fbL2Y4yvTi)9{TOd3g$ywyr*W&)W^T*9t?gQ&mjOYvdLEoiEr5+%wqk>^I
z`B#LGlM=aND~Y#C4&;9Co3AbA?fvhX@tAxU8la_A7vQmCUO1UNzz%_eIdNUq-V;+3
zPvwq(KKk$Chw|Q?PrsDJqeRz+dI#E|5n6KxJQwB@kl{|{3xwV~az4z-`O9B@b@Ax&
zJ4sO?OKk1!5C3wqxW{}#D>Ucy0N#;7{Jl{|mUo<?HmPdpl#}_(<qN&f`Sg9_j=d!=
zqfajv2o{>}>zLbF@m;D1g|+~hPFe>_uqRKF^XvN<?_iExbM_@=e9#qgzlC;sg?p^~
zst2jQkV!!fX|g&XJmcfLGT<5GDs>QFb@l0L{Kyn7;WKmy`_WYo;4K$J7RHK4Q!@I3
zEjB-iJvmbEz}DkK=h{d;C+AigKX`QH>d^!2L5hx&XYiWx4Uko)oyph%p))z(GiFl$
zJ#kalG0&LkV&`+X$IsETK5RiMW-Ratwypyu*n9pKG9{;$(ev!{ly1ei^;t&W3g+u9
z{m8&OkX=U4wx$Du+if}B7!SHV?6H01RJ&kL`$OA%4;QWPO9zmJHy;$}02qv(ACNxJ
zJ^XUm_mRWdHuin%05a*I1LtG<gM#}>8|?d->*;q}HeWH1uYK78{2<RKD6j*g<cdZ9
z$vDr$2EO{p;o*Nz@hHHjXud;6o(>>eZ`>{G2aOA*57uz;IZQgd7_TqviSfqt^K132
zAZ|0|7RxiG1DQU+W<JzhAZ@#IzL(qS3wvZVl{r797Zq!JNnJ?kKqf~th%X@WzYhl1
zNgQMy_%nU@di3e(m(}k!>zD^D8MUcP`GlF+v)6q@LOXWf<O^Tl%jfrnJ$-w9w80vi
z#5yhO40`_b=Wn?FcWobqYkH<UV>u&3>p&jJK7M~$?sXoJHqV@X+;zOJ@qO4IHnoof
z%yYTM!>_#R`d_6qFi(Z_cfCiJ*1>vaqV2Oj`~YeH(CY&|w+`g&ebc5sw^nS?5Z1je
zV@3Ce;X@Kb&?Y$PiEqsuqhpF3eV3!f9^j<Rkg0WKY|UX89T2SC93OJBd~s}R8;reg
z=%>q}{wH{Nv1!;oJh9dXJ>Iwr-}mmd4Uexj_3#oO(5pIYwAm>)DDAmEpC`*c=Y06_
zY)mW%tE~Pf<J!_y>l>}pc)qP2=+h5WTs>bPlNV^^3re4ieKXeg=3{&*rM0iCms3!j
zQdh9+5;y4B%B|UZH1s8dupMM<9f`OT46D}%<QsSFTXA^bc3*k6`m*?s>zMP2k!r_%
z+z#Uy-=WQsz@*bSvE~8fq%t$ERW?ArcgMarp47iG`cBc6ebyGgzyAF#iRaRLOG`2R
z<DdS$c<b%|mA<}uuaCVVmOMRu1RLvpsjIR9^1eIvtvI}Ie?R15CCnYX8Nvrt*;w%a
z*ywZPdapDVkZ<uDH`=nsK0a11rncHDt=mD^S0oRKKQgzDgbjFDg1_M6#{1UTAHwHT
z-SGTOi|;Ac4T(Q8vV6ge4anvLq}>N9|L|(XVT}Dg)^x*u!h2%&T|S1!AK8OJd?ftN
z2PqpMvUl_RmLERkysvr?^R`Rnq47sXmLHJG3(q|rkoNAW+{3Fk4u_ogwf|khJEnCE
z{5?M)k$-mmK#}>m%00ZoM|`ke7QQpoz2$Snv`n>}$<6mBKd^|8gzlO90|Y<U_FEXR
zPBs+gVY^+|eqy<dS<bA{_a;BEh>wgPxG@Ka%uU;G?d`zl2r(M+-m*P0uTw0Ow;EC|
zaod(3n9#qCIY8Pwi`%4Z<=^}G-G<edRcGnn6!DH}%J^Wt>xT6^lEhxYjlBVu?5VSC
z|4_N!8X97GPpzED!}N|la<g*6sW~8w0p$AwOZJxEKc?+hnk*YMHN0bb5^M5<;E$}V
zIUo@S9H<V+w`RWI%J+^D^DFLpwe&ES_ms++_4vW?w{igqJG5F86giu7zqQAs&wYK0
zZ^_l7WlETbv?RvdVAvx=Yrj%L7gs)je9QXa25r{dKSs{SqGeZXKtkRd^0oNvQfK9Y
z5<b9V?7#G9#{Jg5yKT(<p**JU2k3sGkmj-PEgvA^i-5i9`&nym?1LJcpRhmpU_Z`O
zkHlO%n%u0tYKiqAus3}_>vxtzuJwjEr|!uIwA~Xlq~2`P?uYWS)`S!Lkih;V{9f-Z
zTe~gaPifMt6_*T&ZLV$IE3EWw^J@8ki98V4o4&ub-aBUA2V2kj3He`WnX=sv^#gwk
zda(!S>DaM=l?Q?zM<>DF#NU$lkb6C#56qF7)psc4UAspo7=vTz0vN>y@=V}w#(r@d
zl$|y@*MmFbe2VkBC5J9`*oC3>z@pE=&cvQ~t;1=f6aM%n*8%rfp6CI3KZH!<z9`rB
z6SvWK?8g|`H#;B8ELTSF6R}w}W{R;D1M0JqtF`9ZC;sq!9ml+<4~e}xt#rV`Kd~2J
zqmLnTKU0g{JWR%}?=yd3;a_8ChQfbJ*gyCDKjd%IyuA42GcPZG^V>&b!)^B0mkvx3
ze``)Lg)mZO7|U8Q(@11&bkoONFg5(~bEh`n$9~WT5L>M1x^K8E{?=Hf%~)ooWh<As
zMe#OW^S1$%{<eSPVJIFLD_vqk3;!Db54prg+u!$3Y0kHJvVKb+zqgHY7hk~QNp-#S
zYVln9t-d!!yKnI|)w&v=U1iSII>P7Cy_o~7Y-43h!?y8dZjSa6NUYnK@>bbfJ?gXQ
z3iie8Ked0`$=W|=(RNekOQ3e%w*E#`X8p&+-}2dN)_<+vi~C%*f5KeHo(DZG-=}@+
zS6}k?gtQN?)^F~v-tO-%v376TfEMe&Cy`BP+O_t7gg&$NO<0HjGW6l?M?nVGKDf5@
zczi$e`Cs?ik3}D`Kq%MTy%ozObO`M4TWwl%cg^p<hK~0=Oq3U}>EmFmYn#^f<DYu5
zk8YA})XV|aZvZm;zk1*QY2^=+3|2nG7F$@vbzSFz(*4es%qv++zFw0Pw0KU$5nw-$
z<wlv<%{r`i<2q~asMS{6y3h_G8!uPF*zIzJf8zif>WxF|_t#zejlZq=EouBMWluhW
z+kE*O05b-({Pz+c(3(3ey4u#MP1f9!mn*S+p_)G9evn73>y*3plcOo&zpv3_(c#f7
zbT_~MSmJNS0G1D@GO^^Kbyn<<<FV#>>G-#Np_+cCGX9}iWt+NM_Rbp{(oXpMFVhFq
z@fFI9`6WdI&xXeTy3PNk_*;2jFm&(=fB$Lvfb7w-j&SYNYI|t>q3JsL|L|+cIjr;6
zuoHVt53v1ugl&cQmJi^?-TK`a_#+dK4(7oz;(ublKKp?u?@-x#SL=5liMfBFxa(Eg
zHGKdp4;0Re7CmF(kF54R|EKz3$vLdE@{x(W&uZ=u@Gt)RPtcV59r!N)%`TPq)UF}c
z@xArCZ|L{pRr%if`%h*bfWE9bAT|FE9sf-Yo1y8!p2nDmWh>4}*?#$UuH!zuO8t4*
zuHIXCrhITKZWvld``msahHLZ!EaC&q6u;<d{{2VvK;ARw051;k{s!dG`QMn=eJ>~S
z_X{ugnDF~IY`@w7!QY(&ET1lw3$W&leaC4i{u1-}!piq&^2Kw-+q#MlJc#T?V@Ist
z1i&w`mi4}sI~+<r``m779=Gzn$Re@c^T5J9tP?B`Ej+2S#<XVxJbl?`tcKt%F^`*L
zKcz2V8)EI<%X<$k9q{}*&jwifGK7rwxlL~#_r`uA-}}(RJFXY(O+OHwurT#v0Z(7{
z8LvKhOZokl&z~9luHR?ie_OCN*MvPxy?lVBFMY~rpWE`rzO~MW91>$6EN{m+r^@oa
zxh9AWuwnu7;8srX#t&$xq29cYjIA|?Opa)^)|bLOe1^WrY1#k}Q_mN)))3lB<$8RT
z+V5e-dq^eW^H-03)q|7`@Zvjb9$^2`6#v%8JMX?XIfY{1tQYTFd0rSu`3YdCc-CH*
zHo%Mpz|`8~i*2%gC&FB2y}wNWKKq4NCa0I)9F9yayN^s0`}@GIYTl1^M80?P0p4#s
zSd+E(h@jU~(E*k76loHfujSN`rM0(*v6K0&cu~9`V;+}<p0k)HEqiOd-X4K%%NzYu
z?3D*-+IE~0)1<U<wbu5*K9lF&SmTdzEiDTT?z#ZB$CF*SPc!6)xnLXq0N8_dNQ>TY
z%SVBx)EGvF)`83ub{`(+rTCV-C+)fMATsq1Z;uwVj~N#*Rx<Kx^uk)}_IT@BPt4}U
z_~@mzr%U_v^mwVyt$n_fE=b$w%l0?M5cbPEJRP7d;+7$80plb!zAS!_t(D{O_^YjF
z%%|3Lp(%xZYOauP-Szzxwk6M`ZRP<pCjiZ<@to2DzJ;eg^#I&6a@x>g=m<}Avrjz$
zckD~f4yCY9?CFDcu$h-&+4dc2|0tAEeDCE27$Z3ype@E8JbFGwYOEn&`mY`DF%NOM
zD^1Kjr8K3m&&2uQf7BM&n(w5aAICD%GP<1_$0a(TZ80}8h8Z)+kg*t_Jma0re7H8Q
zwf#0%XaY<61&^2>$~?oq*V2^29+_tB#z_r^UEdYixxPS72e$G5kZXhWnBSy+LtKFU
zU~|5wCn6ix2gom(V=Jcv<gu+Bk=Ne7)*}Nir_WqhfIS#=%JF#^=jx^3J94`IU`_{E
z!?tq8`-*kU7ra~R`0C>nV2|wY<Zv4DIsMC-)Pa;w2(Kl-DUM~g>t$~ZU$IAKnfZR}
z*sER%76&;zaymeM`#RVHc=U4lihU-=)A@F*<6g1XtKgrE3(*h!^xVO?*hjwro^oRz
z*%an1j#Tbbx(de0xd0s?Cd$S3%!xH|BJEE3gqPGj5AMjMAYPn|&G+=KL<gAHi05<1
zuIoVw?#Q5UZDR7+t4=I+z>N)ctdd6|XO}xv4|ZW*fW}hX;k_^~h%6^H-z(PMRp=!@
zaIRQ;S8PGfH&p##{|kANDf)@f1Z~zH9i>0K7Wnr%ry;|w#P=SyHT6RKiHChyU%S?V
zO<-+&o4P>X(2$$kL)^&^C-!P8=6W49r(1(-&AWm#u>td!^5tIfe{=p}C{OOyE?{?u
z)Cbz8kD76=w8B%NZ;xz{)lrR%r~a<+GnW%v=3*Z{YoiA$Yp&!}8Jomh{8oz7`h7y!
zC-=Og@AEBfr1G<2pVoaP?#Koi&8LoMTl$2z`^dTU#6QAj?%Gjl=T#nq?AvLJ)llD|
z-*TRn>HzPt?#jAq?c6Y?-as2PruK9>JR^(wQ1YH?yTbFKoWwS&|3z2wByIPI^sNtI
z4lM<_8;du1Kb$H)W6&l16DQu6v&cV`_txa7dqjw*#;^_aL0|YMEylUh4zKXMvvFPD
zx`8Z~GHIm;@@*qq@(ILO?7v}LG7qzkT6^#f-_izc(Pm~nPO(j0Z*b2jPM`<X^MdL?
z?uxAj&+u$%zf)L;&*0@Ayk*$Gc^pVU<b{9mK+aH>yL1oj*Lr>r;B0*>G9+GL{G7`<
zb^M_bTIa19zWLCV0CHW*_e`!+(FJI^!Q4e{xCbKl13B-@2?mel99k#ngTCnVU^vch
zT5cl&!36uDI&mWRU{$LdiZS2OMuW9n=WS@3@;8@p(Yv$R-7rErmOlm?l;!c-3m251
zyn2D+Y_=*luLmDoG>@-7IKC{edbljE8d!e5YT%JR|G;Gr7g}CYaH{1eE}v_0+2DIu
z<!5<e)%>!9x38W*#q(8nvsu&O#ntns!_%vB)8X+|x#8%l*boqOKbt+f)_p@j(EV&C
z1jOZloQ9x_uzexuG%O22arroWE(FHq@UalQMy?PXmjmhX<=wcvM!r0c%1_1RHTHzT
zT=`<1-Y0YA)AjeC$d!-R-@nzhyx!bRsa67A<sW~4x=uh=A1>D4e==9j>2Lfz9uILj
z9$&d~JYM5+^gsUCv<Jr_!(uN^!?IytF2d(xkJcCz1G>hLVc*smy1Q66Kw>Y~2$o`K
zz#4lS5ZKt`fS|@+2Lv_tJRs;P+6xG{OF59(vy=k@n&Op2n(h{hRfkP?fdrQG)vANL
vm*1}%To#q1h8yaZ4KABoiSVwzziePty!>GG`jVxq*BhCwTIVw%Y5Dm7vLS-7

literal 0
HcmV?d00001

diff --git a/src/components/RelatedBusiness.vue b/src/components/RelatedBusiness.vue
index ae23a82..d01e56d 100644
--- a/src/components/RelatedBusiness.vue
+++ b/src/components/RelatedBusiness.vue
@@ -76,7 +76,7 @@ export default {
     // 展示取消关联
     showFoot: {
       type: Boolean,
-      default: false
+      default: true
     },
     showAdd: {
       type: Boolean,
diff --git a/src/components/XrUpgradeDialog.vue b/src/components/XrUpgradeDialog.vue
new file mode 100644
index 0000000..fd457ce
--- /dev/null
+++ b/src/components/XrUpgradeDialog.vue
@@ -0,0 +1,139 @@
+<template>
+  <el-dialog
+    :visible="visible"
+    :close-on-click-modal="false"
+    class="xr-upgrade-dialog"
+    title=""
+    width="700px"
+    append-to-body
+    @close="closeView">
+    <el-button class="close-button" icon="el-icon-close" @click="closeView"/>
+    <flexbox class="upgrade-header" justify="center" align="center" orient="vertical">
+      <span class="upgrade-header__title">升级通知</span>
+      <span class="upgrade-header__version">版本{{ WKConfig.version }}</span>
+    </flexbox>
+    <div class="content">
+      <div class="content__title">升级内容：</div>
+      <div class="content__content">{{ message }}</div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="closeView">我知道了</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { readUpdateNoticeAPI } from '@/api/common'
+
+export default {
+  name: 'XrUpgradeDialog',
+  components: {},
+  props: {
+    visible: Boolean
+  },
+  data() {
+    return {
+      message: `修复：
+1、修复自定义字段设置隐藏生效问题；
+2、修复线索自定义字段转化字段设置生效问题；
+3、修复导入数据超过100条部分的数据无法导入问题；
+4、修复新建场景保存报错问题；
+5、修复客户新建后显示为公海客户，无法操作问题；
+6、修复多选字段高级筛选不生效问题；
+7、修复产品编辑报错问题；
+8、修复部门、人员字段列表展示问题；
+9、修复手机、邮箱字段详情编辑校验问题；
+10、修复活动记录展示其他客户信息的问题；
+11、修复系统提示：“账号在其他地方登录”问题；
+12、修复待办事项今日需联系客户标记完成不生效问题；
+13、修复仪表盘数据统计错误问题；
+14、修复仪表盘遗忘提醒数据查询统计错误问题；
+15、修复仪表盘自定义时间、部门筛选数据统计错误问题；
+16、修复商业智能自定义时间筛选数据统计错误问题；
+17、修复商业智能部门、人员默认筛选数据统计错误问题；
+18、修复 72crm-11.0-web（PHP版）部署后部门、成员不展示问题;
+19、修复其他已知bug。
+20、新增商业智能导出功能。`
+    }
+  },
+  computed: {},
+  watch: {},
+  mounted() {},
+
+  beforeDestroy() {},
+  methods: {
+    closeView() {
+      readUpdateNoticeAPI().then(res => {
+
+      }).catch(() => {})
+      this.$emit('update:visible', false)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.xr-upgrade-dialog {
+  .el-dialog__header {
+    display: none;
+  }
+
+  .el-dialog__body {
+    position: relative;
+    padding: 0 0 20px;
+    height: 500px;
+  }
+
+  .upgrade-header {
+    background-image: url('~@/assets/img/upgrade_bar.png');
+    background-repeat: no-repeat;
+    background-size: cover;
+    height: 131px;
+    color: white;
+
+    &__title {
+      display: inline-block;
+      font-size: 25px;
+      font-weight: bold;
+    }
+
+    &__version {
+      display: inline-block;
+      margin-top: 15px;
+    }
+  }
+
+  .content {
+    padding: 20px 30px;
+    font-size: 14px;
+    position: relative;
+    height: 370px;
+    overflow-y: auto;
+    &__title {
+      font-weight: bold;
+    }
+
+    &__content {
+      margin-top: 15px;
+      white-space: pre-wrap;
+      word-wrap: break-word;
+      word-break: break-all;
+      line-height: 1.5;
+    }
+  }
+
+  .close-button {
+    position: absolute;
+    top: 5px;
+    right: 0;
+    border: none;
+    outline: none;
+    background: transparent;
+    font-size: 19px;
+    font-weight: bold;
+    .el-icon-close {
+      color: white;
+    }
+  }
+}
+</style>
diff --git a/src/config.js b/src/config.js
index ffad1eb..531355c 100644
--- a/src/config.js
+++ b/src/config.js
@@ -3,8 +3,8 @@ const getLocationOrigin = () => {
 }
 
 const companyName = '悟空CRM'
-const version = 'V11.0.1'
-const baiduKey = '百度key'
+const version = 'V11.0.2'
+const baiduKey = 'lcuOQ71SCZhqpxsr1vL2mXoplWEoVctL'
 
 export default {
   version,
diff --git a/src/views/bi/TaskCompleteStatistics.vue b/src/views/bi/TaskCompleteStatistics.vue
index b7388bd..ecb27d4 100644
--- a/src/views/bi/TaskCompleteStatistics.vue
+++ b/src/views/bi/TaskCompleteStatistics.vue
@@ -72,9 +72,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           v-if="showTable"
diff --git a/src/views/bi/achievement/AchievementBackStatistics.vue b/src/views/bi/achievement/AchievementBackStatistics.vue
index 4f277db..c921d5f 100644
--- a/src/views/bi/achievement/AchievementBackStatistics.vue
+++ b/src/views/bi/achievement/AchievementBackStatistics.vue
@@ -15,9 +15,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           :data="list"
diff --git a/src/views/bi/achievement/AchievementCountStatistics.vue b/src/views/bi/achievement/AchievementCountStatistics.vue
index f5a821a..2f1decf 100644
--- a/src/views/bi/achievement/AchievementCountStatistics.vue
+++ b/src/views/bi/achievement/AchievementCountStatistics.vue
@@ -15,9 +15,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           :data="list"
diff --git a/src/views/bi/achievement/AchievementInvoiceStatistics.vue b/src/views/bi/achievement/AchievementInvoiceStatistics.vue
index a72b122..0343d58 100644
--- a/src/views/bi/achievement/AchievementInvoiceStatistics.vue
+++ b/src/views/bi/achievement/AchievementInvoiceStatistics.vue
@@ -9,10 +9,10 @@
       module-type="invoice"
       @load="loading=true"
       @change="getDataList">
-      <!-- <el-button
+      <el-button
         class="export-button"
         type="primary"
-        @click.native="exportClick">导出</el-button> -->
+        @click.native="exportClick">导出</el-button>
     </filtrate-handle-view>
     <div class="content">
       <div class="content-title">
diff --git a/src/views/bi/achievement/AchievementMoneyStatistics.vue b/src/views/bi/achievement/AchievementMoneyStatistics.vue
index 70cdcda..53d8358 100644
--- a/src/views/bi/achievement/AchievementMoneyStatistics.vue
+++ b/src/views/bi/achievement/AchievementMoneyStatistics.vue
@@ -15,9 +15,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           :data="list"
diff --git a/src/views/bi/achievement/AchievementSummaryStatistics.vue b/src/views/bi/achievement/AchievementSummaryStatistics.vue
index 899d5f7..0eb0a72 100644
--- a/src/views/bi/achievement/AchievementSummaryStatistics.vue
+++ b/src/views/bi/achievement/AchievementSummaryStatistics.vue
@@ -9,10 +9,10 @@
       module-type="contract"
       @load="loading=true"
       @change="getDataList">
-      <!-- <el-button
+      <el-button
         class="export-button"
         type="primary"
-        @click.native="exportClick">导出</el-button> -->
+        @click.native="exportClick">导出</el-button>
     </filtrate-handle-view>
     <div class="content">
       <div class="content-title">
diff --git a/src/views/bi/business/BusinessWinStatistics.vue b/src/views/bi/business/BusinessWinStatistics.vue
index d86a3b3..b8eebf6 100644
--- a/src/views/bi/business/BusinessWinStatistics.vue
+++ b/src/views/bi/business/BusinessWinStatistics.vue
@@ -47,7 +47,8 @@
 <script>
 import {
   biBusinessWinAPI,
-  biBusinessTrendListAPI
+  // biBusinessTrendListAPI
+  biBusinessConversionRateListAPI
 } from '@/api/bi/business'
 
 import ReportList from '@/views/crm/workbench/components/ReportList'
@@ -176,7 +177,7 @@ export default {
     handleRowClick(row, column, event) {
       if (column.property != 'name' && row[column.property].replace('%', '') > 0) {
         this.reportData.title = `${column.label}详情`
-        this.reportData.request = biBusinessTrendListAPI
+        this.reportData.request = biBusinessConversionRateListAPI
         const params = { ...this.postParams }
         params.type = column.label
         this.reportData.params = params
diff --git a/src/views/bi/components/FiltrateHandleView.vue b/src/views/bi/components/FiltrateHandleView.vue
index 79cf34d..8943387 100644
--- a/src/views/bi/components/FiltrateHandleView.vue
+++ b/src/views/bi/components/FiltrateHandleView.vue
@@ -120,7 +120,7 @@ import XhUserCell from '@/components/CreateCom/XhUserCell'
 import TimeTypeSelect from '@/components/TimeTypeSelect'
 
 import moment from 'moment'
-
+import { mapGetters } from 'vuex'
 export default {
   name: 'FiltrateHandleView', // 筛选条件
   components: {
@@ -214,9 +214,11 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['userInfo']),
     showUserStrucSelect() {
       return this.showUserSelect
     }
+
   },
   watch: {},
   mounted() {
@@ -321,7 +323,7 @@ export default {
       const params = {}
       if (this.showUserStrucSelect) {
         if (this.dataSelect == 1) {
-          params.structure_id = this.structuresSelectValue.length > 0 ? this.structuresSelectValue[0].id : '1'
+          params.structure_id = this.structuresSelectValue.length > 0 ? this.structuresSelectValue[0].id : this.userInfo.structure_id
         }
       } else {
         params.structure_id = this.structuresSelectValue.length > 0 ? this.structuresSelectValue[0].id : '1'
diff --git a/src/views/bi/customer/CustomerPoolStatistics.vue b/src/views/bi/customer/CustomerPoolStatistics.vue
index 40208eb..6224694 100644
--- a/src/views/bi/customer/CustomerPoolStatistics.vue
+++ b/src/views/bi/customer/CustomerPoolStatistics.vue
@@ -14,9 +14,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           v-if="showTable"
diff --git a/src/views/bi/customer/CustomerRecordModeStatistics.vue b/src/views/bi/customer/CustomerRecordModeStatistics.vue
index 678500d..95555a5 100644
--- a/src/views/bi/customer/CustomerRecordModeStatistics.vue
+++ b/src/views/bi/customer/CustomerRecordModeStatistics.vue
@@ -18,9 +18,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           v-if="showTable"
diff --git a/src/views/bi/customer/CustomerRecordStatistics.vue b/src/views/bi/customer/CustomerRecordStatistics.vue
index d2ebe54..f74c607 100644
--- a/src/views/bi/customer/CustomerRecordStatistics.vue
+++ b/src/views/bi/customer/CustomerRecordStatistics.vue
@@ -14,9 +14,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           v-if="showTable"
diff --git a/src/views/bi/customer/CustomerSatisfaction.vue b/src/views/bi/customer/CustomerSatisfaction.vue
index 17ec3f9..4ba6f11 100644
--- a/src/views/bi/customer/CustomerSatisfaction.vue
+++ b/src/views/bi/customer/CustomerSatisfaction.vue
@@ -8,10 +8,10 @@
       module-type="contract"
       @load="loading=true"
       @change="getDataList">
-      <!-- <el-button
+      <el-button
         class="export-button"
         type="primary"
-        @click.native="exportClick">导出</el-button> -->
+        @click.native="exportClick">导出</el-button>
     </filtrate-handle-view>
     <div class="content">
       <div class="table-content">
diff --git a/src/views/bi/customer/CustomerTotalStatistics.vue b/src/views/bi/customer/CustomerTotalStatistics.vue
index ffdcb86..8b680a5 100644
--- a/src/views/bi/customer/CustomerTotalStatistics.vue
+++ b/src/views/bi/customer/CustomerTotalStatistics.vue
@@ -15,9 +15,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           v-if="showTable"
diff --git a/src/views/bi/customer/ProductSatisfaction.vue b/src/views/bi/customer/ProductSatisfaction.vue
index 3b86dda..5b9014b 100644
--- a/src/views/bi/customer/ProductSatisfaction.vue
+++ b/src/views/bi/customer/ProductSatisfaction.vue
@@ -8,10 +8,10 @@
       module-type="contract"
       @load="loading=true"
       @change="getDataList">
-      <!-- <el-button
+      <el-button
         class="export-button"
         type="primary"
-        @click.native="exportClick">导出</el-button> -->
+        @click.native="exportClick">导出</el-button>
     </filtrate-handle-view>
     <div class="content">
       <div class="table-content">
diff --git a/src/views/bi/customer/components/CycleView.vue b/src/views/bi/customer/components/CycleView.vue
index a1e258d..4b2d1b4 100644
--- a/src/views/bi/customer/components/CycleView.vue
+++ b/src/views/bi/customer/components/CycleView.vue
@@ -18,9 +18,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           v-if="showTable"
diff --git a/src/views/bi/oa/Examine.vue b/src/views/bi/oa/Examine.vue
index 416ab57..26176ed 100644
--- a/src/views/bi/oa/Examine.vue
+++ b/src/views/bi/oa/Examine.vue
@@ -8,10 +8,10 @@
       module-type="oa"
       @load="loading=true"
       @change="getDataList">
-      <!-- <el-button
+      <el-button
         class="export-button"
         type="primary"
-        @click.native="exportExcel">导出</el-button> -->
+        @click.native="exportExcel">导出</el-button>
     </filtrate-handle-view>
     <div class="content">
       <div class="table-content">
diff --git a/src/views/bi/oa/Log.vue b/src/views/bi/oa/Log.vue
index 402658d..10429fc 100644
--- a/src/views/bi/oa/Log.vue
+++ b/src/views/bi/oa/Log.vue
@@ -8,10 +8,10 @@
       module-type="oa"
       @load="loading=true"
       @change="getDataList">
-      <!-- <el-button
+      <el-button
         class="export-button"
         type="primary"
-        @click.native="exportExcel">导出</el-button> -->
+        @click.native="exportExcel">导出</el-button>
     </filtrate-handle-view>
     <div class="content">
       <div class="table-content">
diff --git a/src/views/bi/product/ProductStatistics.vue b/src/views/bi/product/ProductStatistics.vue
index 646a684..73b912d 100644
--- a/src/views/bi/product/ProductStatistics.vue
+++ b/src/views/bi/product/ProductStatistics.vue
@@ -8,10 +8,10 @@
       module-type="product"
       @load="loading=true"
       @change="getProductDatalist">
-      <!-- <el-button
+      <el-button
         class="export-button"
         type="primary"
-        @click.native="exportClick">导出</el-button> -->
+        @click.native="exportClick">导出</el-button>
     </filtrate-handle-view>
     <div class="content">
       <el-table
diff --git a/src/views/bi/ranking/RankingAddContactsStatistics.vue b/src/views/bi/ranking/RankingAddContactsStatistics.vue
index 7c19e1e..6d710d1 100644
--- a/src/views/bi/ranking/RankingAddContactsStatistics.vue
+++ b/src/views/bi/ranking/RankingAddContactsStatistics.vue
@@ -19,9 +19,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           :data="list"
diff --git a/src/views/bi/ranking/RankingAddCustomerStatistics.vue b/src/views/bi/ranking/RankingAddCustomerStatistics.vue
index c718de8..c1ff670 100644
--- a/src/views/bi/ranking/RankingAddCustomerStatistics.vue
+++ b/src/views/bi/ranking/RankingAddCustomerStatistics.vue
@@ -19,9 +19,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           :data="list"
diff --git a/src/views/bi/ranking/RankingContractStatistics.vue b/src/views/bi/ranking/RankingContractStatistics.vue
index ac9c0b5..850aa4f 100644
--- a/src/views/bi/ranking/RankingContractStatistics.vue
+++ b/src/views/bi/ranking/RankingContractStatistics.vue
@@ -19,9 +19,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           :data="list"
diff --git a/src/views/bi/ranking/RankingExamineStatistics.vue b/src/views/bi/ranking/RankingExamineStatistics.vue
index 720d156..2d3b439 100644
--- a/src/views/bi/ranking/RankingExamineStatistics.vue
+++ b/src/views/bi/ranking/RankingExamineStatistics.vue
@@ -19,9 +19,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           :data="list"
diff --git a/src/views/bi/ranking/RankingProductStatistics.vue b/src/views/bi/ranking/RankingProductStatistics.vue
index abf4949..ea749d8 100644
--- a/src/views/bi/ranking/RankingProductStatistics.vue
+++ b/src/views/bi/ranking/RankingProductStatistics.vue
@@ -19,9 +19,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           :data="list"
diff --git a/src/views/bi/ranking/RankingReceivablesStatistics.vue b/src/views/bi/ranking/RankingReceivablesStatistics.vue
index 335675b..44661d4 100644
--- a/src/views/bi/ranking/RankingReceivablesStatistics.vue
+++ b/src/views/bi/ranking/RankingReceivablesStatistics.vue
@@ -19,9 +19,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           :data="list"
diff --git a/src/views/bi/ranking/RankingRecordCustomerStatistics.vue b/src/views/bi/ranking/RankingRecordCustomerStatistics.vue
index 9daed28..d5ed402 100644
--- a/src/views/bi/ranking/RankingRecordCustomerStatistics.vue
+++ b/src/views/bi/ranking/RankingRecordCustomerStatistics.vue
@@ -19,9 +19,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           :data="list"
diff --git a/src/views/bi/ranking/RankingRecordNunStatistics.vue b/src/views/bi/ranking/RankingRecordNunStatistics.vue
index 1e6d515..f566dab 100644
--- a/src/views/bi/ranking/RankingRecordNunStatistics.vue
+++ b/src/views/bi/ranking/RankingRecordNunStatistics.vue
@@ -19,9 +19,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           :data="list"
diff --git a/src/views/bi/ranking/RankingSigningStatistics.vue b/src/views/bi/ranking/RankingSigningStatistics.vue
index 124d901..ec2cabc 100644
--- a/src/views/bi/ranking/RankingSigningStatistics.vue
+++ b/src/views/bi/ranking/RankingSigningStatistics.vue
@@ -19,9 +19,9 @@
       </div>
       <div class="table-content">
         <div class="handle-bar">
-          <!-- <el-button
+          <el-button
             class="export-btn"
-            @click="exportClick">导出</el-button> -->
+            @click="exportClick">导出</el-button>
         </div>
         <el-table
           :data="list"
diff --git a/src/views/crm/business/Detail.vue b/src/views/crm/business/Detail.vue
index 50a0b88..3500083 100644
--- a/src/views/crm/business/Detail.vue
+++ b/src/views/crm/business/Detail.vue
@@ -398,6 +398,8 @@ export default {
         .then(res => {
           this.loading = false
           this.detailData = res.data
+          if (this.detailData.dataAuth === 0) return
+
           this.firstContactsId = this.detailData.contacts_id
 
           this.headDetails[0].value = res.data.customer_id_info.name
diff --git a/src/views/crm/components/Activity/LogEditDialog.vue b/src/views/crm/components/Activity/LogEditDialog.vue
index 26f2391..6f75a5a 100644
--- a/src/views/crm/components/Activity/LogEditDialog.vue
+++ b/src/views/crm/components/Activity/LogEditDialog.vue
@@ -424,6 +424,8 @@ export default {
       this.$wkUploadFile.upload({
         file: file,
         params: {
+          module_id: this.id,
+          module: 'crm_' + this.crmType,
           type: type,
           batchId: this.batchId
         }
diff --git a/src/views/crm/components/CRMEditBaseInfo.vue b/src/views/crm/components/CRMEditBaseInfo.vue
index 4320ecb..551744f 100644
--- a/src/views/crm/components/CRMEditBaseInfo.vue
+++ b/src/views/crm/components/CRMEditBaseInfo.vue
@@ -513,7 +513,7 @@ export default {
       if (this.isSeas) {
         return false
       }
-      if (this.crmType == 'business' && ['statusName', 'typeName'].includes(item.form_type)) {
+      if (this.crmType == 'business' && ['business_type', 'business_status'].includes(item.form_type)) {
         return false
       } else if (this.crmType == 'contract' && ['business', 'contacts', 'customer'].includes(item.form_type)) {
         return false
@@ -578,7 +578,7 @@ export default {
     },
 
     editConfirm() {
-      // customerId    fieldId   fieldType  field  formType  value
+      // customerId    fieldId   fieldType  field  form_type  value
       // this.editCancel()
       this.$refs.editForm0[0].validate(valid => {
         if (valid) {
@@ -640,38 +640,38 @@ export default {
 
     getRealValue(element, value) {
       if (
-        element.formType == 'customer' ||
-        element.formType == 'contacts' ||
-        element.formType == 'business' ||
-        element.formType == 'leads' ||
-        element.formType == 'contract'
+        element.form_type == 'customer' ||
+        element.form_type == 'contacts' ||
+        element.form_type == 'business' ||
+        element.form_type == 'leads' ||
+        element.form_type == 'contract'
       ) {
         if (value && value.length) {
-          return value[0][`${element.formType}Id`]
+          return value[0][`${element.form_type}_id`]
         } else {
           return ''
         }
       } else if (
-        element.formType == 'user' ||
-        element.formType == 'single_user' ||
-        element.formType == 'structure'
+        element.form_type == 'user' ||
+        element.form_type == 'single_user' ||
+        element.form_type == 'structure'
       ) {
         return value
           .map(item => {
-            return (element.formType == 'user' || element.formType == 'single_user') ? item.userId : item.id
+            return (element.form_type == 'user' || element.form_type == 'single_user') ? item.id : item.id
           })
-          .join(',')
-      } else if (element.formType == 'file') {
+          // .join(',')
+      } else if (element.form_type == 'file') {
         if (value && value.length > 0) {
-          return value[0].batchId
+          return value.map(item => item.file_id)
         }
-        return ''
-      } else if (element.formType == 'category') {
+        return []
+      } else if (element.form_type == 'category') {
         if (value && value.length > 0) {
           return value[value.length - 1]
         }
         return ''
-      } else if (element.formType == 'checkbox') {
+      } else if (element.form_type == 'checkbox') {
         if (value && value.length > 0) {
           return value.join(',')
         }
@@ -766,12 +766,15 @@ export default {
       }
 
       // 验证唯一
-      if (item.isUnique == 1) {
+      if (item.is_unique == 1) {
         var validateUnique = (rule, value, callback) => {
           if ((isArray(value) && value.length == 0) || !value) {
             callback()
           } else {
-            var validatesParams = {}
+            var validatesParams = {
+              field: item.field,
+              types: 'crm_' + this.crmType
+            }
             validatesParams.fieldId = item.fieldId
             if (isArray(value)) {
               let postValue = ''
@@ -798,15 +801,15 @@ export default {
                   postValue = value.join(',')
                 }
               }
-              validatesParams.value = postValue
+              validatesParams.val = postValue
             } else {
-              validatesParams.value = value
+              validatesParams.val = value
             }
             validatesParams.batchId = this.detail.batchId
             filedValidatesAPI(validatesParams)
               .then(res => {
-                // status 1 通过 0
-                if (res.data.status === 1) {
+                // code 200 通过
+                if (res.code == 200) {
                   callback()
                 } else {
                   callback(new Error(item.name + '已存在'))
@@ -874,7 +877,7 @@ export default {
         tempList.push({
           validator: validateCRMMobile,
           item: item,
-          trigger: []
+          trigger: ['blur', 'change']
         })
       } else if (item.form_type == 'email') {
         var validateCRMEmail = (rule, value, callback) => {
@@ -890,7 +893,7 @@ export default {
         tempList.push({
           validator: validateCRMEmail,
           item: item,
-          trigger: []
+          trigger: ['blur', 'change']
         })
       }
       return tempList
diff --git a/src/views/crm/components/DuplicateCheck/index.vue b/src/views/crm/components/DuplicateCheck/index.vue
index 346c338..109d159 100644
--- a/src/views/crm/components/DuplicateCheck/index.vue
+++ b/src/views/crm/components/DuplicateCheck/index.vue
@@ -288,7 +288,7 @@ export default {
         })
           .then(() => {
             crmCustomerReceiveAPI({
-              ids: [data.id],
+              customer_id: [data.id],
               poolId: data.poolAuthList.poolId
             })
               .then(res => {
@@ -299,7 +299,7 @@ export default {
           })
           .catch(() => {})
       } else {
-        data['customerId'] = data.id
+        data['customer_id'] = data.id
         this.relationData = data
         this.allocDialogShow = true
       }
diff --git a/src/views/crm/components/FilterForm/index.vue b/src/views/crm/components/FilterForm/index.vue
index 769e373..f1b78fb 100644
--- a/src/views/crm/components/FilterForm/index.vue
+++ b/src/views/crm/components/FilterForm/index.vue
@@ -497,7 +497,8 @@ export default {
           o.form_type == 'single_user' ||
           o.form_type == 'structure' ||
           o.form_type == 'category' ||
-          o.form_type == 'checkbox'
+          o.form_type == 'checkbox' ||
+          o.form_type == 'select'
         ) {
           if (!o.value || o.value.length === 0) {
             if (o.condition != 'isNull' && o.condition != 'isNotNull') {
diff --git a/src/views/crm/components/RelativeProduct.vue b/src/views/crm/components/RelativeProduct.vue
index 61303b0..3a17cdc 100644
--- a/src/views/crm/components/RelativeProduct.vue
+++ b/src/views/crm/components/RelativeProduct.vue
@@ -109,7 +109,7 @@ export default {
       })
       this.fieldList.push({ prop: 'unit', width: '200', label: '单位' })
       this.fieldList.push({ prop: 'price', width: '200', label: '标准价格' })
-      this.fieldList.push({ prop: 'salesPrice', width: '200', label: '售价' })
+      this.fieldList.push({ prop: 'sales_price', width: '200', label: '售价' })
       this.fieldList.push({ prop: 'num', width: '200', label: '数量' })
       this.fieldList.push({
         prop: 'discount',
@@ -120,7 +120,7 @@ export default {
     },
 
     fieldFormatter(row, column) {
-      if (column.property == 'price' || column.property == 'salesPrice') {
+      if (column.property == 'price' || column.property == 'sales_price') {
         return separator(row[column.property] || 0)
       }
       return row[column.property]
diff --git a/src/views/crm/contacts/Detail.vue b/src/views/crm/contacts/Detail.vue
index cafd872..9470cb3 100644
--- a/src/views/crm/contacts/Detail.vue
+++ b/src/views/crm/contacts/Detail.vue
@@ -257,6 +257,8 @@ export default {
         .then(res => {
           this.loading = false
           this.detailData = res.data
+          if (this.detailData.dataAuth === 0) return
+
           // 负责人
           this.headDetails[0].value = res.data.customer_name
           this.headDetails[1].value = res.data.post
diff --git a/src/views/crm/contract/Detail.vue b/src/views/crm/contract/Detail.vue
index fd986e0..5d3a910 100644
--- a/src/views/crm/contract/Detail.vue
+++ b/src/views/crm/contract/Detail.vue
@@ -277,6 +277,7 @@ export default {
           // 创建回款计划的时候使用
           const resData = res.data || {}
           this.detailData = resData
+          if (this.detailData.dataAuth === 0) return
 
           this.headDetails[0].value = resData.num
           this.headDetails[1].value = resData.customer_id_info.name
diff --git a/src/views/crm/customer/Detail.vue b/src/views/crm/customer/Detail.vue
index ad749c8..b37c4b2 100644
--- a/src/views/crm/customer/Detail.vue
+++ b/src/views/crm/customer/Detail.vue
@@ -378,6 +378,7 @@ export default {
           const resData = res.data || {}
           this.detailData = resData
           if (resData.dataAuth === 0) return
+
           this.firstContactsId = this.detailData.contacts_id
           // 公海权限
           // this.poolAuth = resData.poolAuthList || {}
diff --git a/src/views/crm/invoice/Detail.vue b/src/views/crm/invoice/Detail.vue
index 04c663f..d37c75a 100644
--- a/src/views/crm/invoice/Detail.vue
+++ b/src/views/crm/invoice/Detail.vue
@@ -170,6 +170,7 @@ export default {
           this.name = res.data.invoice_number
           this.detailData = res.data
           this.getBaseList(res.data)
+          if (this.detailData.dataAuth === 0) return
 
           //   // 负责人
           this.headDetails[0].value = res.data.customer_name
diff --git a/src/views/crm/leads/Create.vue b/src/views/crm/leads/Create.vue
index 78e0a52..a5f8027 100644
--- a/src/views/crm/leads/Create.vue
+++ b/src/views/crm/leads/Create.vue
@@ -123,7 +123,7 @@ export default {
             // temp.value = item.value
             const canEdit = this.getItemIsCanEdit(item, this.action.type)
             // 是否能编辑权限
-            if (this.action.type !== 'update') {
+            if (canEdit) {
               fieldRules[temp.field] = this.getRules(item)
             }
 
diff --git a/src/views/crm/leads/Detail.vue b/src/views/crm/leads/Detail.vue
index cfe2dcc..84d3ba6 100644
--- a/src/views/crm/leads/Detail.vue
+++ b/src/views/crm/leads/Detail.vue
@@ -194,6 +194,7 @@ export default {
       crmLeadsReadAPI({ id: this.id })
         .then(res => {
           this.detailData = res.data
+          if (this.detailData.dataAuth === 0) return
 
           this.headDetails[0].value = res.data.name
           this.headDetails[1].value = res.data.source
diff --git a/src/views/crm/message/compenents/CRMMessage.vue b/src/views/crm/message/compenents/CRMMessage.vue
index 0e90bd8..28ce9d0 100644
--- a/src/views/crm/message/compenents/CRMMessage.vue
+++ b/src/views/crm/message/compenents/CRMMessage.vue
@@ -438,7 +438,7 @@ export default {
         params.type_id = this.selectionList
           .map(item => {
             let temp = []
-            const fieldKey = this.crmType === 'receivables_plan' ? 'planId' : `${this.crmType}_id`
+            const fieldKey = this.crmType === 'receivables_plan' ? 'plan_id' : `${this.crmType}_id`
             // temp.typeId = item[fieldKey]
             temp = item[fieldKey]
             // 待进入公海提醒 需要的公海id
diff --git a/src/views/crm/mixins/Table.js b/src/views/crm/mixins/Table.js
index 66bcd54..3ec016e 100644
--- a/src/views/crm/mixins/Table.js
+++ b/src/views/crm/mixins/Table.js
@@ -434,7 +434,7 @@ export default {
           this.rowID = row.customer_id
           this.rowType = 'customer'
           this.showDview = true
-        } else if (column.property === 'contract_number') {
+        } else if (column.property === 'contract_num') {
           this.rowID = row.contract_id
           this.rowType = 'contract'
           this.showDview = true
diff --git a/src/views/crm/product/Detail.vue b/src/views/crm/product/Detail.vue
index b22b0ce..cc6c2f6 100644
--- a/src/views/crm/product/Detail.vue
+++ b/src/views/crm/product/Detail.vue
@@ -201,6 +201,7 @@ export default {
         .then(res => {
           this.loading = false
           this.detailData = res.data
+          if (this.detailData.dataAuth === 0) return
 
           this.headDetails[0].value = res.data.category_id_info
           this.headDetails[1].value = res.data.unit
diff --git a/src/views/crm/receivables/Detail.vue b/src/views/crm/receivables/Detail.vue
index 99912a7..26e9a4d 100644
--- a/src/views/crm/receivables/Detail.vue
+++ b/src/views/crm/receivables/Detail.vue
@@ -169,6 +169,8 @@ export default {
           this.loading = false
           this.name = res.data.number
           this.detailData = res.data
+          if (this.detailData.dataAuth === 0) return
+
           //   // 负责人
           this.headDetails[0].value = res.data.customer_id_info.name
           this.headDetails[1].value = separator(res.data.contract_id_info.money || 0)
diff --git a/src/views/crm/visit/Detail.vue b/src/views/crm/visit/Detail.vue
index daf049d..ab4bbcf 100644
--- a/src/views/crm/visit/Detail.vue
+++ b/src/views/crm/visit/Detail.vue
@@ -142,6 +142,7 @@ export default {
         .then(res => {
           this.loading = false
           this.detailData = res.data
+          if (this.detailData.dataAuth === 0) return
 
           this.headDetails[0].value = res.data.customer_name
           this.headDetails[1].value = res.data.visit_time
diff --git a/src/views/crm/workbench/components/DataStatistics.vue b/src/views/crm/workbench/components/DataStatistics.vue
index 5cf7ca4..6760c90 100644
--- a/src/views/crm/workbench/components/DataStatistics.vue
+++ b/src/views/crm/workbench/components/DataStatistics.vue
@@ -27,7 +27,7 @@
           跟进汇总
         </div>
         <div class="info">
-          跟进客户<span class="bold">{{ data.activityNum }}</span>个，新增客户中未跟进<span class="bold">{{ data.allCustomer - data.activityRealNum }}</span>个
+          跟进客户<span class="bold">{{ data.activityNum }}</span>个，新增客户中未跟进<span class="bold">{{ data.allCustomer - data.activityNum }}</span>个
         </div>
       </div>
       <div class="list-item">
diff --git a/src/views/crm/workbench/components/chartMixins.js b/src/views/crm/workbench/components/chartMixins.js
index 51a7055..8f9bf0f 100644
--- a/src/views/crm/workbench/components/chartMixins.js
+++ b/src/views/crm/workbench/components/chartMixins.js
@@ -46,17 +46,17 @@ export default {
       } else {
         if (this.filterValue.strucs.length) {
           params.isUser = 0
-          params.deptId = this.filterValue.strucs[0].id
+          params.structure_id = [this.filterValue.strucs[0].id]
         } else {
           params.isUser = 1
-          params.userId = this.filterValue.users.length ? this.filterValue.users[0].id : ''
+          params.user_id = this.filterValue.users.length ? this.filterValue.users[0].id : ''
         }
       }
 
       if (this.filterValue.timeLine.type) {
         if (this.filterValue.timeLine.type === 'custom') {
-          params.startTime = this.filterValue.timeLine.startTime.replace(/\./g, '-')
-          params.endTime = this.filterValue.timeLine.endTime.replace(/\./g, '-')
+          params.start_time = this.filterValue.timeLine.startTime.replace(/\./g, '-')
+          params.end_time = this.filterValue.timeLine.endTime.replace(/\./g, '-')
         } else {
           params.type = this.filterValue.timeLine.value || ''
         }
diff --git a/src/views/crm/workbench/index.vue b/src/views/crm/workbench/index.vue
index c0f740e..0626df7 100644
--- a/src/views/crm/workbench/index.vue
+++ b/src/views/crm/workbench/index.vue
@@ -231,7 +231,7 @@ export default {
 
       // 排序
       sortLeft: [
-        // { 'id': null, 'userId': null, 'modelId': 7, 'list': 1, 'sort': null, 'isHidden': 0, 'companyId': null, 'component': 'RankingStatistics' }, { 'id': null, 'userId': null, 'modelId': 5, 'list': 1, 'sort': null, 'isHidden': 0, 'companyId': null, 'component': 'SalesFunnel' }, { 'id': null, 'userId': null, 'modelId': 4, 'list': 1, 'sort': null, 'isHidden': 0, 'companyId': null, 'component': 'PerformanceChart' }, { 'id': null, 'userId': null, 'modelId': 2, 'list': 1, 'sort': null, 'isHidden': 0, 'companyId': null, 'component': 'DataStatistics' }, { 'id': null, 'userId': null, 'modelId': 6, 'list': 1, 'sort': null, 'isHidden': 0, 'companyId': null, 'component': 'ForgetRemind' }, { 'id': null, 'userId': null, 'modelId': 1, 'list': 1, 'sort': null, 'isHidden': 0, 'companyId': null, 'component': 'SaleStatistics' }
+        // { 'id': null, 'user_id': null, 'modelId': 7, 'list': 1, 'sort': null, 'isHidden': 0, 'companyId': null, 'component': 'RankingStatistics' }, { 'id': null, 'user_id': null, 'modelId': 5, 'list': 1, 'sort': null, 'isHidden': 0, 'companyId': null, 'component': 'SalesFunnel' }, { 'id': null, 'user_id': null, 'modelId': 4, 'list': 1, 'sort': null, 'isHidden': 0, 'companyId': null, 'component': 'PerformanceChart' }, { 'id': null, 'user_id': null, 'modelId': 2, 'list': 1, 'sort': null, 'isHidden': 0, 'companyId': null, 'component': 'DataStatistics' }, { 'id': null, 'user_id': null, 'modelId': 6, 'list': 1, 'sort': null, 'isHidden': 0, 'companyId': null, 'component': 'ForgetRemind' }, { 'id': null, 'user_id': null, 'modelId': 1, 'list': 1, 'sort': null, 'isHidden': 0, 'companyId': null, 'component': 'SaleStatistics' }
       ],
       sortRight: [],
       setSortShow: false
diff --git a/src/views/layout/components/MessageCell.vue b/src/views/layout/components/MessageCell.vue
index f50b0f3..402a0fd 100644
--- a/src/views/layout/components/MessageCell.vue
+++ b/src/views/layout/components/MessageCell.vue
@@ -115,7 +115,7 @@ export default {
       if (this.data.label && this.data.label <= 5) {
         key = ['task', 'log', 'examine', 'announcement', 'schedule'][this.data.label - 1]
       } else {
-        if ([1, 2, 3].includes(this.data.type)) {
+        if ([1, 2, 3, 27].includes(this.data.type)) {
           key = 'task'
         } else if ([4, 5, 34].includes(this.data.type)) {
           key = 'log'
@@ -166,14 +166,14 @@ export default {
         14: `${this.data.user_name}提交 `,
         15: `${this.data.user_name}拒绝您的`,
         16: `${this.data.user_name}已经审核通过您的`,
-        17: `${this.data.user_name}导入客户数据${this.data.title}条，${this.getImportContent(this.data)}`,
-        1500: `${this.data.user_name}取消导入客户数据，已导入${this.data.title}条，${this.getImportContent(this.data)}`,
-        18: `${this.data.user_name}导入联系人数据${this.data.title}条，${this.getImportContent(this.data)}`,
+        17: `${this.data.user_name}导入客户数据，${this.getImportContent(this.data)}`,
+        1500: `${this.data.user_name}取消导入客户数据，已导入，${this.getImportContent(this.data)}`,
+        18: `${this.data.user_name}导入联系人数据，${this.getImportContent(this.data)}`,
         1700: `${this.data.user_name}取消导入联系人数据，已导入${this.data.title}条，${this.getImportContent(this.data)}`,
-        19: `${this.data.user_name}导入线索数据${this.data.title}条，${this.getImportContent(this.data)}`,
-        1900: `${this.data.user_name}取消导入线索数据，已导入${this.data.title}条，${this.getImportContent(this.data)}`,
-        20: `${this.data.user_name}导入产品数据${this.data.title}条，${this.getImportContent(this.data)}`,
-        2100: `${this.data.user_name}取消导入产品数据，已导入${this.data.title}条，${this.getImportContent(this.data)}`,
+        19: `${this.data.user_name}导入线索数据，${this.getImportContent(this.data)}`,
+        1900: `${this.data.user_name}取消导入线索数据，已导入，${this.getImportContent(this.data)}`,
+        20: `${this.data.user_name}导入产品数据，${this.getImportContent(this.data)}`,
+        2100: `${this.data.user_name}取消导入产品数据，已导入，${this.getImportContent(this.data)}`,
         22: `${this.data.user_name}将您添加为商机`,
         21: `${this.data.user_name}将您添加为客户`,
         23: `${this.data.user_name}将您添加为合同`,
@@ -190,7 +190,7 @@ export default {
         25: `${this.data.user_name}拒绝您的`,
         26: `${this.data.user_name}已经审核通过您的`,
         24: `${this.data.user_name}提交了`,
-        27: `${this.data.user_name}项目任务导入`
+        27: `${this.data.user_name}项目任务导入数据，${this.getImportContent(this.data)}`
       }[this.data.type]
     },
 
@@ -222,7 +222,7 @@ export default {
      * 是导入type
      */
     isImportType() {
-      return this.data.type >= 17 && this.data.type <= 20 || this.data.type == 27
+      return (this.data.type >= 17 && this.data.type <= 20) || this.data.type == 27
     },
 
     rightContent() {
@@ -263,7 +263,7 @@ export default {
         32: `的团队`,
         33: `的团队`,
         34: `：“${this.data.content}”，请及时查看`,
-        25: `，拒绝理由：“${this.data.content}”，请及时处理`,
+        25: `发票审批，拒绝理由：“${this.data.content}”，请及时处理`,
         26: `发票，请及时查看`,
         24: `发票审批，请及时处理`,
         27: ``
@@ -325,7 +325,7 @@ export default {
     },
 
     getImportContent({ title, content }) {
-      const countList = [17, 1500, 18, 1700, 19, 1900, 20, 2100, 50]
+      const countList = [17, 1500, 18, 1700, 19, 1900, 20, 2100, 50, 27]
       if (!countList.includes(this.data.type)) {
         return
       }
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 07f1c46..7320121 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -56,7 +56,7 @@
       class="sidebar-bottom">
       <div class="sidebar-bottom-content">
         <div v-if="!collapse" class="copyright">
-          <img src="/favicon.ico" width="20px" >
+          <img src="@/assets/img/favicon.png" width="20px" >
           <span>Power by 悟空</span>
         </div>
         <img
diff --git a/src/views/oa/journal/NewDialog.vue b/src/views/oa/journal/NewDialog.vue
index bb874c7..1ddfa8a 100644
--- a/src/views/oa/journal/NewDialog.vue
+++ b/src/views/oa/journal/NewDialog.vue
@@ -125,6 +125,7 @@
           <related-business
             :margin-left="'0'"
             :all-data="allData"
+            @unbind="unbindRelatedInfo"
             @checkInfos="checkInfos" />
         </div>
       </div>
@@ -310,6 +311,31 @@ export default {
     }
   },
   methods: {
+    /**
+     * 解绑详情信息
+     */
+    unbindRelatedInfo(field, item, index) {
+      this.$confirm('确认取消关联?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        customClass: 'is-particulars'
+      })
+        .then(() => {
+          const tempRelatedListData = JSON.parse(JSON.stringify(this.allData))
+          tempRelatedListData[field].splice(index, 1)
+          this.allData = tempRelatedListData
+          var relevanceAll = {}
+          relevanceAll.business_ids = this.allData.business.map(item => item.business_id)
+          relevanceAll.contacts_ids = this.allData.contacts.map(item => item.contacts_id)
+          relevanceAll.contract_ids = this.allData.contract.map(item => item.contract_id)
+          relevanceAll.customer_ids = this.allData.customer.map(item => item.customer_id)
+          this.relevanceAll = relevanceAll
+        })
+        .catch(() => {
+          this.$message.info('已取消操作')
+        })
+    },
     /**
      * 获取图片内容
      */
diff --git a/src/views/pm/components/TaskImport.vue b/src/views/pm/components/TaskImport.vue
index 95afa11..850a6b4 100644
--- a/src/views/pm/components/TaskImport.vue
+++ b/src/views/pm/components/TaskImport.vue
@@ -54,9 +54,9 @@
         <div class="result-info">
           <i class="wk wk-success result-info__icon" />
           <p class="result-info__des">数据导入完成</p>
-          <p v-if="resultData" class="result-info__detail">导入总数据<span class="result-info__detail--all">{{ resultData.totalSize }}</span>条，导入成功<span class="result-info__detail--suc">{{ resultData.totalSize - resultData.errSize }}</span>条，导入失败<span class="result-info__detail--err">{{ resultData.errSize }}</span>条</p>
+          <p v-if="resultData" class="result-info__detail">导入总数据<span class="result-info__detail--all">{{ resultData.total }}</span>条，导入成功<span class="result-info__detail--suc">{{ resultData.total - resultData.error }}</span>条，导入失败<span class="result-info__detail--err">{{ resultData.error }}</span>条</p>
           <el-button
-            v-if="resultData && resultData.errSize > 0"
+            v-if="resultData && resultData.error > 0"
             class="result-info__btn--err"
             type="text"
             @click="downloadErrData">下载错误数据</el-button>
@@ -88,7 +88,10 @@ import {
   workExcelImportAPI,
   workDownloadErrorExcelAPI
 } from '@/api/pm/project'
-
+import {
+  crmQueryImportNumAPI,
+  crmQueryImportInfoAPI
+} from '@/api/crm/common'
 
 import { downloadExcelWithResData, verifyFileTypeWithFileName } from '@/utils/index'
 
@@ -128,7 +131,16 @@ export default {
           status: 'wait'
         }
       ],
-      resultData: null
+      resultData: null,
+      processData: {
+        count: 0,
+        status: ''
+      },
+      messageId: null,
+      intervalTimer: null,
+
+      historyPopoverShow: false
+
     }
   },
   computed: {
@@ -172,16 +184,18 @@ export default {
           this.stepList[1].status = 'process'
           this.stepsActive = 2
           this.firstUpdateFile(res => {
-            this.stepList[1].status = 'finish'
-            this.stepsActive = 3
-            if (res.data) {
-              this.resultData = res.data
-              if (this.resultData.errSize > 0) {
-                this.stepList[2].status = 'error'
-              } else {
-                this.stepList[2].status = 'finish'
-              }
-            }
+            this.messageId = res.data
+            // this.stepList[1].status = 'finish'
+            // this.stepsActive = 3
+            // if (res.data) {
+            //   this.resultData = res.data
+            //   if (this.resultData.errSize > 0) {
+            //     this.stepList[2].status = 'error'
+            //   } else {
+            //     this.stepList[2].status = 'finish'
+            //   }
+            // }
+            this.loopSecondQueryNum()
           })
         } else {
           if (!this.file.name) {
@@ -207,8 +221,8 @@ export default {
           if (result) {
             result(res)
           }
-          this.loading = false
-          this.$emit('success')
+          // this.loading = false
+          // this.$emit('success')
         })
         .catch(() => {
           if (result) {
@@ -217,13 +231,64 @@ export default {
           this.loading = false
         })
     },
+    /**
+     * 第二步查询数量
+     */
+    loopSecondQueryNum() {
+      this.secondQueryNum()
+      this.intervalTimer = setInterval(() => {
+        if (this.processData.status == 'end') {
+          clearInterval(this.intervalTimer)
+          this.intervalTimer = null
+          this.thirdQueryResult()
+        } else {
+          this.secondQueryNum()
+        }
+      }, 2000)
+    },
 
+    secondQueryNum() {
+      crmQueryImportNumAPI({ messageId: this.messageId })
+        .then(res => {
+          if (res.data === '') {
+            this.processData.status = 'end'
+          } else {
+            this.processData.status = ''
+            this.processData.count = res.data
+          }
+        })
+        .catch(() => {
+          // this.processData.status = 'err'
+        })
+    },
+
+    /**
+     * 第三部 查询结果
+     */
+    thirdQueryResult() {
+      crmQueryImportInfoAPI({ messageId: this.messageId })
+        .then(res => {
+          this.loading = false
+          this.stepList[1].status = 'finish'
+          this.stepsActive = 3
+          this.$emit('status', 'finish')
+          if (res) {
+            this.resultData = res.data
+            if (res.data.error > 0) {
+              this.stepList[2].status = 'error'
+            } else {
+              this.stepList[2].status = 'finish'
+            }
+          }
+        })
+        .catch(() => {})
+    },
     /**
      * 下载错误模板
      */
     downloadErrData() {
       this.loading = true
-      workDownloadErrorExcelAPI({ token: this.resultData.token })
+      workDownloadErrorExcelAPI({ name: '导入错误数据', path: this.resultData.error_file_path })
         .then(res => {
           downloadExcelWithResData(res)
           this.loading = false
diff --git a/src/views/pm/project/Corver.vue b/src/views/pm/project/Corver.vue
index 6450b5e..fc3fb1f 100644
--- a/src/views/pm/project/Corver.vue
+++ b/src/views/pm/project/Corver.vue
@@ -162,7 +162,7 @@ export default {
       tabShowType: 'board',
       search: '',
       filterObj: {},
-      filterValue: 1,
+      filterValue: 4,
       filterList: [{
         label: '按最早创建',
         value: 1
@@ -172,6 +172,9 @@ export default {
       }, {
         label: '按最近更新',
         value: 3
+      }, {
+        label: '按手动拖动',
+        value: 4
       }],
       isCreate: false,
       list: [],
diff --git a/src/views/pm/project/index.vue b/src/views/pm/project/index.vue
index 41b5c40..e8842d7 100644
--- a/src/views/pm/project/index.vue
+++ b/src/views/pm/project/index.vue
@@ -37,8 +37,8 @@
               @submite="setSubmite"
               @handle="projectSettingsHandle"
               @click="projectHandleShow = false"/>
-            <!-- <p v-if="permission.excelImport" @click="taskImportShow = true">导入任务</p>
-            <p v-if="permission.excelExport" @click="exportClick">导出任务</p> -->
+            <p v-if="permission.excelImport" @click="taskImportShow = true">导入任务</p>
+            <p v-if="permission.excelExport" @click="exportClick">导出任务</p>
             <p
               v-if="permission.archiveTask && permission.setWork"
               @click="archiveProject">归档项目</p>
@@ -447,7 +447,11 @@ export default {
       this.projectHandleShow = false
       this.loading = true
       workTaskExportAPI({
-        work_id: this.work_id
+        work_id: this.work_id,
+        search: this.taskConditionObj.search,
+        owner_user_id: this.taskConditionObj.userIds,
+        time_type: this.taskConditionObj.timeId,
+        label_id: this.taskConditionObj.tagIds
       })
         .then(res => {
           downloadExcelWithResData(res)
diff --git a/src/views/pm/task/index.vue b/src/views/pm/task/index.vue
index 5f9fc56..9e6562b 100644
--- a/src/views/pm/task/index.vue
+++ b/src/views/pm/task/index.vue
@@ -8,7 +8,7 @@
       ft-top="0"
       @search="searchClick">
       <span slot="label">我的任务</span>
-      <!-- <el-popover
+      <el-popover
         slot="label"
         v-model="taskHandleShow"
         placement="bottom-start"
@@ -19,7 +19,7 @@
         <i
           slot="reference"
           class="wk wk-manage set-img" />
-      </el-popover> -->
+      </el-popover>
       <template slot="ft">
         <el-dropdown
           trigger="click"
@@ -523,6 +523,7 @@ export default {
       this.taskHandleShow = false
       this.loading = true
       taskWorkbenchExportAPI({
+        is_top: 5,
         search: this.search,
         sort_field: this.filterValue.sort,
         completed_task: this.filterValue.completed_task,
diff --git a/src/views/workLog/index.vue b/src/views/workLog/index.vue
index 1d0538b..fe1c2a7 100644
--- a/src/views/workLog/index.vue
+++ b/src/views/workLog/index.vue
@@ -252,7 +252,7 @@ export default {
 
       filterForm: {
         category_id: 0,
-        send_user_id: ''
+        create_user_id: ''
       },
       userSelects: [],
 
@@ -364,7 +364,7 @@ export default {
     }
     this.filterForm = {
       category_id: 0,
-      send_user_id: ''
+      create_user_id: ''
     }
     this.userSelects = []
 
@@ -518,8 +518,8 @@ export default {
         }[this.logType]
       }
 
-      if (this.logType == 'send' && params.hasOwnProperty('send_user_id')) {
-        delete params.send_user_id
+      if (this.logType == 'send' && params.hasOwnProperty('create_user_id')) {
+        delete params.create_user_id
       }
 
       if (params.hasOwnProperty('category_id') && params.category_id === 0) {
@@ -649,11 +649,11 @@ export default {
     userChange(data) {
       this.userSelects = data.value || []
       if (data.value.length > 0) {
-        this.filterForm.send_user_id = data.value.map(item => {
+        this.filterForm.create_user_id = data.value.map(item => {
           return item.id
         })
       } else {
-        this.filterForm.send_user_id = ''
+        this.filterForm.create_user_id = ''
       }
     },
 
@@ -663,9 +663,9 @@ export default {
     checkUserHistory(user) {
       this.userSelects = user ? [user] : []
       if (user) {
-        this.filterForm.send_user_id = user.id
+        this.filterForm.create_user_id = user.id
       } else {
-        this.filterForm.send_user_id = ''
+        this.filterForm.create_user_id = ''
       }
     },
 
diff --git a/static/client.js b/static/client.js
index 191856c..3f1c223 100644
--- a/static/client.js
+++ b/static/client.js
@@ -54,6 +54,46 @@
     }
   }
 
+  window.onload = function() {
+    var n = document.createElement('div')
+    n.style.position = 'fixed'
+    n.style.bottom = '2px'
+    n.style.left = '0'
+    n.style.right = '0'
+    n.style.textAlign = 'center'
+    n.style.fontSize = '12px'
+    n.style.color = '#999'
+    n.style.zIndex = 1
+
+    var i = document.createElement('img')
+    i.style.width = '14px'
+    i.style.verticalAlign = 'bottom'
+    i.style.marginRight = '5px'
+
+    var img = new Image()
+    img.onload = function() {
+      var canvas = document.createElement('canvas')
+      var ctx = canvas.getContext('2d')
+
+      canvas.height = img.naturalHeight
+      canvas.width = img.naturalWidth
+      ctx.drawImage(img, 0, 0)
+
+      var uri = canvas.toDataURL('image/png')
+      i.src = uri
+      n.appendChild(i)
+      var ti = ''
+      var tis = [80, 111, 119, 101, 114, 32, 98, 121, 32]
+      tis.forEach(c => {
+        ti = ti + String.fromCharCode(c)
+      })
+      var t = document.createTextNode(ti + decodeURI('%E6%82%9F%E7%A9%BA'))
+      n.appendChild(t)
+      document.body.appendChild(n)
+    }
+    img.src = 'static/img/logo.png'
+  }
+
   if (Sys.appName === 'IE' && Number(Sys.version) < 10) {
     window.location.href = './static/index.html'
   }
diff --git a/static/img/logo.png b/static/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3ad886e29532d2f78e67b26b3ac973054e1ccab
GIT binary patch
literal 3132
zcmbVPc{r4N8y;&S97}Rqr;#ifV>UA;!x*DXWeH_yEMvUG7_*oeW^fehi#V2(r7Uq0
z%91FKEZI^h`AU|uM9G$<4N38hPMz=j<6P&D@4c?~{cX>EKhN)ep68GEjHCU2WyQ^k
zAP`8IY)f*IjQVS@g1qGW>&i{GWcXQVLlHW28A1__4}h$Exjq1x%%=GPP5{j}G^hhG
z2Z3Zlm@X6{#qJP}&Se|Z)@+Q$Y@P%S0-0Nic{Dl;5Q2RGKPCqcnX7ArfSJB{h%4I8
z#ExeT_%m(8_<(bmy$d~zMK|+>SXzM1#W)E88xYdKVs;=$fD_{(-*|D7`Pw!N0{&(q
zWZ@xy21T)R1Y2|Y02pm-3Z=tQSTM%S7;cI(L7EzY5hidmm<bjJM?y{DI1^JG8Uz0R
zKqTJyz6_ibY2SBWk`*4}FBI}{FqlXrG8Q3?xqLqu+{{eEfq)?pP>BUp5XuqK#88ev
z=LZ7`5YYKdo{-7qfY%slKHOj-9wLeK&nvKbc6NUea|GXol1K&<(|9nru?dXLUc1*f
zYk|-S_-`10Yb|gI<pD4!K)?;=(<S*}===anwEJgAYlf0&a1MN?Bq_8&5|<v#1~@`8
z2@jE+82d7PadadD>tkw4hx+<r8BiL4qCsg0v=0=GL?dYklqm{9r~TmhJ3In`fm>m%
ziKaFfBphx-#F9`%ECOqd!B|^kO|AF+z>+xvA&o-^e)wiee1FGU{Ua7<%?D^gF5iXA
z4g66Bj{aOBSK!a(fvv5-WgV>V%H;TRMFNAhH2ryN62NDM0KWV9TsHWd&N$}Z#DGD;
z8D<z10t%R6XiyY`frQeqCUmF|20=$LkSGLzK|sFaeg9wmV3MF<YsK<E#q(oJQju%Z
zzgj`E_^X)!j--S5l2#e+8FB`J6sTm9m5X?wGlO*~9nfx@J9iQS-cHcGqY<qiO)#7?
zPsL?b9UdvZnt6<Ky!4NTw5+m$d;F{O7w!5D`v)>3rkpRUcFFW<CS8er;pX^O0b=-8
zk-IuF9DbuMW-(N%>ME;l!NNRdd1a)3zENe-&i{Tolo6|bb~hQBZ`19>j6&_t+#R9M
zPBA?&lV8>Sp}V}Y&GJcY@XQPQbd;?3nZuy8Zj6Syy63Ce*#`>$BC2_0Il749@2_d&
zCvmCS*}r^#emll;>a!odVb|>D*ZC*qu<oCuBkQk`<5SL_g%lMPU3@pzwuPy$qjURL
zZFtL+MdTq#Yfe486+W>rJ6KpyaA&ACxWo};*|)ewLqp@lhM3#Ata@bk8$G$$-UFz&
zyQRXndrKOa(Uom>@r;Jvz$R2i?>g1(+5}o_YN{rZ)*_pdmBpHPkmWa*ix2NZp-{Vq
zYXp7?cf&pCSNn;71jP2;{3Y&o^Yd<3)bsvsl%1A)xp!1YXD4cLZUmE%kTB6*aBxC`
zFT8Z=(nuS><Y#n%rk3gB%MKVfH@ChPJ%=1rRaKQ%W$DT}t%cKKanKczbN-yI<(=U1
z@$tf&H=jtG1;0uyDk(vFcz9UH85!Y3Z>X%^t}go<qB&2&(tDtExU|t#>19Q;^r7?y
zy|2EV=i!X$?t+lF5+_+-mlp?{b4i7ESqv>>s{iP0L&S2YL^G+-gXzB<1<%OK@De^Q
zKf1I(YyAGXEytx!voy7L<MG2Ac32EG=&QJiMs9^yH!8K>uB=2Ymo$~nwKxYol<$e#
zxTiCpoYEO3v##?uo&Dl!GRI3l+4Y5#kw#QWjPjQBhJaqflnWQwA+Mj%j6Li9B?2=Q
z6%{*g295oivnZ#q)m-!@+w8<jeU-6QOKZIYK}vmkdK%7Vv(u}^CvD*CzO)W&6S9Xd
z%GDbsFMiIeEH1w1;pbm4V&JY6Waa6ZQ&d)Fy2+SY&dISn(GaZEH?>UZ*V&(laxOen
z(Z}X;F-uEJjE=LqNk+0eUEizxzJ9Bg{FROry}>&uG`b?v{MKVgS>MNq$s!e4K-&Gw
z_7?);;^G3q<xab^(5$}5p_W=lpGSE%NuYRLvHT{whdHSUu6o#5HBeGeti&DOwWSqN
zJ&^?_tIa3ZT?OQ2y4D-`mrGagF*GdgRo!6`2=$~;YzwvbxHitp#m*c0-g4u`kYkNL
zp*49)IybYZWOdi73Q$GERQbN6okGyOsKp(dr}*gH%%_J(;#UuVWC~*6YUtUYub{UL
zG>$iK1>(|Fz#im{(=r57#;Za*)ps|AV|SIEot^1A*$VUb=V$uainRJB+-7COqJ=@c
zdB>O9)l3;mX}g`?b^VWru*rmg?t79%Kghv{mxk99H(4jE71W9565SLpc_bY<B`TxV
z_!#WV>CMXx0(C^Ffokg~2(m|%kG?6DKkt98S9KR%7B8xKq#HU>xZIrLVp4-23`WXr
z08N5k1{h5=gv}Q}i23RcE|76j3;nHmG|_bw>9HaHF63n+MSAf{n>|QL>u%abr>#v}
zIZnr?OtL`>of$~DR4pnhOm2oQ^=ZpYjTg_L;NJ(gmEK!?L2IwUrrB#((-^Cu{Oo4M
z>6X1T^B}8<%W`os^~x-VN*mRs8X{^NPS{>nTv{5~L}qqSb<`a6Sv_9<nwsXGk?cg(
z3i(NkjE0(;r@Nib?wO9c(}cb@`i#;-tl03#o^BO!`No+$?7OWgoIsH2tFhRl8hJCy
znUN}=2dY>hKgD{vxjltpqfg1bIDVJb9GRfY@v=6W!o0>(V#3!48I7s?Irco)iu+2C
z8s+Yy4k$|d4I0?M1Wj}rGZ>UKDxlilAOytfX$FU38^hNHZ1{b@`A+^jFrLn0?HSAE
zgJ8Bv@jKLxYNsBp-*(^IW3Yc?{I#AZQCe0-1utnPp|3FOe)3v9rPLn&+R}EwN?lVy
zW_`~))4CP8@(gKhY8rZPYySlmFq&1j{dDgg5)Wyhd&PWdE_|lQ^72xn(q@fojv2O=
z6vy{<11p=kw+CAHt>^dk_a957bx>Y7s6LGT*c?Il4OvrIEVkk&=_jVSkLop6Qm^wV
zbj}A+kLD;0II}$9vX~qb?Jmk29=wpeS)4mGVfx`E&UQ|DSFzJW(^QMpt{6gETJ`;~
z#?MljQ*Iq$<G+)t9Mv)-f&1z6GGyb{jVoQ}XQj$Qv~~jG#~RC7lx^rOh)nf`_RNyQ
zN1uJMoqYMU_ql4w;`o4GXDeP;SND(FCZ);kgi&Mu&b|*JZ6t`)gt9!<zUE^H^i6(L
zf(Ctdpeo+x6uPbM`m<askR2*-k$+bAARtv(S=nQMAV_poJ0s_T%Jl9lY5Xs(!7l2s
zNn0RtY^m$QUiP!c)E(=GT)&1n>>!*9$#<`H%5K-Z;yHWF8p-G^m&xO)M7~vIg+fmk
zR46LtjfD*Vq}CZtF#*(z6{w_9h1mzvi_MM>)d%uN%Ewan?%f3Q%qDJ(I`Q_5e(=?e
zQqQR>gyN_{d4igGlYGR&>!*Fuf%mZX&F$BR{G_X&2PKXqQ>SAdeaMuZ{Zx0vHAamP
zsq<>+UDiPzilW7fFr$4-(OgP~ck+>N-&>?xt}tGfEN3uftG9X?m%K>s-@Z4blsJ%;
zn>%umnqjpt`J|;LJrV@=F4sJ9Bl+}cc|($4Wx{3ls?BIato*pMne@c2kE+up-MyKw
z%?_N6G*4c}Y2G@+WHO72i5;@(;w^nEc}lJ`{k?VvWXIzLue@>>ent~>Mgy0QO(Uiu
zZvJKJq8uUd<HN^$W)G_-d#xshU1YScI>jE@zv}Ql2_yp|^gSS+CdRG(8-U0*_M|eR
Hcl3V%ZE#eY

literal 0
HcmV?d00001