Merge branch 'dev4.6.3.14' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.14

# Conflicts:
#	src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -502,6 +502,7 @@ var vNode = {
     },
     //数据导出
     onExport(){
+      var _this = this
       var storageSet = JSON.parse(sessionStorage.getItem('winner_high_set'))
       var data = {
         entId: this.entInfo.id,

src/web/staticres/common-module/big-member/js/ent_project_news.js

@@ -269,8 +269,7 @@ var vConfig = {
             data: storageSet ? Object.assign(data, storageSet) : data,
             timeout: 8000,
             success:function(res) {
-              var isWeiXinBrowser = navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1
-              window.location.href = (isWeiXinBrowser ? '/front/wx_dataExport/submitOrder' : '/jyapp/front/dataExport/toCreateOrderPage') + "?id=" + res.data
+              window.location.href = "/jyapp/front/dataExport/toCreateOrderPage?id=" + res.data
             },
             error:function(err) {
               console.log(err)

src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -520,6 +520,7 @@ var vNode = {
     },
     //数据导出
     onExport(){
+      var _this = this
       var storageSet = JSON.parse(sessionStorage.getItem('winner_high_set'))
       var data = {
         entId: this.entInfo.id,

src/web/staticres/common-module/keep-tags/keep-tags-template.js

@@ -573,6 +573,34 @@ Vue.component('keep-component', {
     }
   }
 })
+function checkRequiredKeys (keys, target) {
+  try {
+    // 职位/部门特殊处理, 满足时移除部门校验
+    if (keys.indexOf('branch') !== -1 && keys.indexOf('position') !== -1) {
+      if (target['position'] === '总裁' || target['position'] === '总经理') {
+        keys.splice(keys.indexOf('branch'), 1)
+      }
+    }
+    return !keys.some(function (k) {
+      var tempValue = target[k]
+      var result = false
+      if (typeof tempValue === 'number') {
+        tempValue = tempValue.toString()
+      }
+      if (typeof tempValue === 'string') {
+        result = tempValue.trim() !== ''
+      }
+      if (typeof tempValue === 'boolean') {
+        result = true
+      }
+      return !result
+    })
+  } catch (e) {
+    console.warn(e)
+    return false
+  }
+}
+
 // 检查返回是否需要继续下一步
 function checkBackSuccess () {
   var isBackSuccess = sessionStorage.getItem('salesBackStatus') || false