浏览代码

Merge branch 'dev/v4.9.4_tsz' of qmx/jy into feature/v4.9.4

汤世哲 1 年之前
父节点
当前提交
8af3bb2f6c
共有 2 个文件被更改,包括 4 次插入1 次删除
  1. 3 0
      src/web/staticres/BI-module/js/crm-action.js
  2. 1 1
      src/web/templates/pc/supsearch.html

+ 3 - 0
src/web/staticres/BI-module/js/crm-action.js

@@ -270,6 +270,9 @@ var crmNode = new Vue({
         sourceType: 1,
         sourceType: 1,
         employType: 1
         employType: 1
       }
       }
+      if(item.active && this.fromJhfp) {
+        params.from = this.fromJhfp
+      }
       if(!item.active) {
       if(!item.active) {
         url = '/jyNewApi/property/information/exist'
         url = '/jyNewApi/property/information/exist'
         info = this.employInfo[0]
         info = this.employInfo[0]

+ 1 - 1
src/web/templates/pc/supsearch.html

@@ -3114,7 +3114,7 @@ function checkTagDisabled () {
     }
     }
     if (getParam('resource') === 'BI') {
     if (getParam('resource') === 'BI') {
       if(getParam('property') === 'BIProperty') {
       if(getParam('property') === 'BIProperty') {
-        aHref += aHref.indexOf('?') > -1 ? '&resource=BI&property=BIProperty&from=jhfp' : '?resource=BI&property=BIProperty&from=jhfp'
+        aHref += aHref.indexOf('?') > -1 ? '&resource=BI&property=BIProperty' : '?resource=BI&property=BIProperty'
       } else {
       } else {
         aHref += aHref.indexOf('?') > -1 ? '&resource=BI' : '?resource=BI'
         aHref += aHref.indexOf('?') > -1 ? '&resource=BI' : '?resource=BI'
       }
       }