eoss-ui 0.5.63 → 0.5.64

package/lib/eoss-ui.common.js

@@ -2200,7 +2200,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2890,7 +2890,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;
@@ -13569,8 +13571,8 @@ error_page_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var error_page = (error_page_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=6983cacd&
-var mainvue_type_template_id_6983cacd_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=55faec94&
+var mainvue_type_template_id_55faec94_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -25026,11 +25028,11 @@ var mainvue_type_template_id_6983cacd_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_6983cacd_staticRenderFns = []
-mainvue_type_template_id_6983cacd_render._withStripped = true
+var mainvue_type_template_id_55faec94_staticRenderFns = []
+mainvue_type_template_id_55faec94_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=6983cacd&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=55faec94&
 
 // CONCATENATED MODULE: ./src/utils/rules.js
 // 手机号
@@ -29985,6 +29987,9 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
       var type = arguments[2];
       var validate = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
 
+      if (this.readonly) {
+        return Promise.resolve();
+      }
       if (!handle) {
         handle = this.handles || {};
       }
@@ -30325,8 +30330,8 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 
 var form_src_main_component = normalizeComponent(
   packages_form_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_6983cacd_render,
-  mainvue_type_template_id_6983cacd_staticRenderFns,
+  mainvue_type_template_id_55faec94_render,
+  mainvue_type_template_id_55faec94_staticRenderFns,
   false,
   null,
   null,
@@ -33060,8 +33065,8 @@ var CommonOpinions_component = normalizeComponent(
 )
 
 /* harmony default export */ var CommonOpinions = (CommonOpinions_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processForm.vue?vue&type=template&id=aaac09fe&
-var processFormvue_type_template_id_aaac09fe_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processForm.vue?vue&type=template&id=38d27a4e&
+var processFormvue_type_template_id_38d27a4e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -33527,11 +33532,11 @@ var processFormvue_type_template_id_aaac09fe_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_aaac09fe_staticRenderFns = []
-processFormvue_type_template_id_aaac09fe_render._withStripped = true
+var processFormvue_type_template_id_38d27a4e_staticRenderFns = []
+processFormvue_type_template_id_38d27a4e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=aaac09fe&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=38d27a4e&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=db651118&
 var selectUservue_type_template_id_db651118_render = function () {
@@ -35314,6 +35319,7 @@ var processFormvue_type_script_lang_js_components;
           }
         }
       },
+      userModel: {},
       nextUserTabs: {},
       selectPresetUserList: [],
       presetOptions: [],
@@ -35358,12 +35364,39 @@ var processFormvue_type_script_lang_js_components;
       }
     }
   },
+  created: function created() {
+    this.getUserInfo();
+  },
   mounted: function mounted() {
     this.getStartFlow(this.processDefinitionId);
     this.newOpinion = this.opinion;
   },
 
   methods: {
+    getUserInfo: function getUserInfo() {
+      var _this = this;
+
+      var mainConfig = utils_util["a" /* default */].getStorage('mainConfig');
+      if (mainConfig) {
+        this.userModel = JSON.parse(mainConfig).userModel;
+      } else {
+        utils_util["a" /* default */].ajax({ url: api["cb" /* loginUserInfo */] }).then(function (res) {
+          var status = res.status,
+              data = res.data;
+
+          if (status == 'success') {
+            _this.userModel = data;
+          } else {
+            var msg = res.msg || '系统错误，请联系管理员！';
+            _this.$message.error(msg);
+          }
+        }).catch(function (err) {
+          if (err.message && err.message !== 'canceled') {
+            _this.$message.error(err.message);
+          }
+        });
+      }
+    },
     getIsShowNextUser: function getIsShowNextUser(val) {
       if (val == 7 || val == 8 || val == 9 || val == 10 || val == 11 || val == 12) {
         this.isShowNextUser = false;
@@ -35449,7 +35482,7 @@ var processFormvue_type_script_lang_js_components;
       this.mixOrgIdList = mixList;
     },
     getNodeType: function getNodeType() {
-      var _this = this;
+      var _this2 = this;
 
       utils_util["a" /* default */].ajax({
         url: api["u" /* findCodeValues */],
@@ -35462,19 +35495,19 @@ var processFormvue_type_script_lang_js_components;
             data = res.data;
 
         if (status === 'success') {
-          _this.nextNode.noticeList = data;
+          _this2.nextNode.noticeList = data;
         }
       }).catch(function (err) {
-        _this.loading = false;
+        _this2.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this.$message.error(err.message);
+          _this2.$message.error(err.message);
         }
       });
     },
 
     //获取通知信息
     getMessage: function getMessage() {
-      var _this2 = this;
+      var _this3 = this;
 
       var params = {
         processDefinitionId: this.processDefinitionId,
@@ -35483,12 +35516,12 @@ var processFormvue_type_script_lang_js_components;
       };
       utils_util["a" /* default */].ajax({ url: api["I" /* getNotificationMsg */], params: params, methods: 'post' }).then(function (res) {
         if (res.status === 'success') {
-          _this2.nextNode.noticeInfo = res.message;
+          _this3.nextNode.noticeInfo = res.message;
         }
       }).catch(function (err) {
-        _this2.loading = false;
+        _this3.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this2.$message.error(err.message);
+          _this3.$message.error(err.message);
         }
       });
     },
@@ -35498,11 +35531,11 @@ var processFormvue_type_script_lang_js_components;
       this.saveProcess(formName);
     },
     saveProcess: function saveProcess(formName) {
-      var _this3 = this;
+      var _this4 = this;
 
       this.$refs[formName].validate(function (valid) {
         if (valid) {
-          var _nextNode = _this3.nextNode,
+          var _nextNode = _this4.nextNode,
               nextNode = _nextNode.nextNode,
               nextUser = _nextNode.nextUser,
               noticeInfo = _nextNode.noticeInfo,
@@ -35514,20 +35547,20 @@ var processFormvue_type_script_lang_js_components;
               newOpinion = _nextNode.newOpinion;
 
           if (noticeType.length === 0) {
-            return _this3.$message.warning('请选择通知方式');
+            return _this4.$message.warning('请选择通知方式');
           }
-          if (_this3.isShowNextUser) {
-            if (nextUser == '' || _this3.multiple && nextUser.length == 0) {
-              return _this3.$message.warning('请选择下步办理人');
+          if (_this4.isShowNextUser) {
+            if (nextUser == '' || _this4.multiple && nextUser.length == 0) {
+              return _this4.$message.warning('请选择下步办理人');
             }
           } else {
-            if (nextOrgId == '' || _this3.multiple && nextOrgId.length == 0) {
-              return _this3.$message.warning('请选择办理对象');
+            if (nextOrgId == '' || _this4.multiple && nextOrgId.length == 0) {
+              return _this4.$message.warning('请选择办理对象');
             }
           }
-          _this3.loading = true;
+          _this4.loading = true;
           var newNextUser = [];
-          if (_this3.multiple) {
+          if (_this4.multiple) {
             nextUser && nextUser.map(function (item) {
               return newNextUser.push(item);
             });
@@ -35537,37 +35570,37 @@ var processFormvue_type_script_lang_js_components;
             newNoticeType = noticeType.join(',');
           }
           var params = {
-            processDefinitionId: _this3.processDefinitionId,
-            nextUserId: _this3.multiple ? newNextUser.join(',') : nextUser,
+            processDefinitionId: _this4.processDefinitionId,
+            nextUserId: _this4.multiple ? newNextUser.join(',') : nextUser,
             nextNodeId: nextNode,
-            businessId: _this3.businessId,
+            businessId: _this4.businessId,
             notificationType: newNoticeType,
             userId: utils_util["a" /* default */].getStorage('userId'),
             notificationMsg: noticeInfo,
-            customPresetUserJson: JSON.stringify(_this3.presetList),
-            presetUserJson: JSON.stringify(_this3.presetUserJson),
-            nextReadUserId: _this3.readMultiple ? _this3.mixReadList && _this3.mixReadList.join('|') : nextReadUserId,
-            nextOrgId: !_this3.isShowNextUser ? _this3.multiple ? _this3.mixOrgIdList && _this3.mixOrgIdList.join('|') : nextOrgId : '',
+            customPresetUserJson: JSON.stringify(_this4.presetList),
+            presetUserJson: JSON.stringify(_this4.presetUserJson),
+            nextReadUserId: _this4.readMultiple ? _this4.mixReadList && _this4.mixReadList.join('|') : nextReadUserId,
+            nextOrgId: !_this4.isShowNextUser ? _this4.multiple ? _this4.mixOrgIdList && _this4.mixOrgIdList.join('|') : nextOrgId : '',
             handleExplain: handleExplain,
-            presetReadUserId: _this3.mixPresetList && _this3.mixPresetList.length > 0 ? _this3.mixPresetList.join('|') : presetReadUserId.join(','),
-            opinion: _this3.newOpinion || newOpinion
+            presetReadUserId: _this4.mixPresetList && _this4.mixPresetList.length > 0 ? _this4.mixPresetList.join('|') : presetReadUserId.join(','),
+            opinion: _this4.newOpinion || newOpinion
           };
-          if (_this3.activeNames != '1') delete params.customPresetUserJson;
+          if (_this4.activeNames != '1') delete params.customPresetUserJson;
           utils_util["a" /* default */].ajax({ url: api["mb" /* register */], method: 'post', data: params }).then(function (res) {
             var status = res.status,
                 message = res.message;
 
-            _this3.loading = false;
+            _this4.loading = false;
             if (status === 'success') {
-              _this3.quit(true);
-              _this3.$message.success('操作成功');
+              _this4.quit(true);
+              _this4.$message.success('操作成功');
             } else {
-              _this3.$message.error(message || '系统错误，请联系管理员！');
+              _this4.$message.error(message || '系统错误，请联系管理员！');
             }
           }).catch(function (err) {
-            _this3.loading = false;
+            _this4.loading = false;
             if (err.message && err.message !== 'canceled') {
-              _this3.$message.error(err.message);
+              _this4.$message.error(err.message);
             }
           });
         } else {
@@ -35576,7 +35609,7 @@ var processFormvue_type_script_lang_js_components;
       });
     },
     getNodeInfos: function getNodeInfos(nodeId, index) {
-      var _this4 = this;
+      var _this5 = this;
 
       var params = {
         processDefinitionId: this.processDefinitionId,
@@ -35592,63 +35625,63 @@ var processFormvue_type_script_lang_js_components;
             countersignaturetypeText = _res$data.countersignaturetypeText,
             countersignaturetypeCode = _res$data.countersignaturetypeCode;
 
-        _this4.loading = false;
+        _this5.loading = false;
         if (status === 'success') {
-          _this4.nextNode.userInfo = nextUserList;
-          _this4.countersignaturetypeCode = countersignaturetypeCode;
-          _this4.nextNode.countersignaturetypeText = countersignaturetypeText;
-          _this4.isTaskread = nodeExtAttr.isTaskread;
-          _this4.isHandleExplain = nodeExtAttr.isHandleExplain;
-          _this4.isCustomUser = nodeExtAttr.isCustomUser; //是否展示选人组件按钮
-          _this4.presetEdit = nodeExtAttr.presetEdit; //是否展示备选人
-          _this4.isDefSelectedObj = nodeExtAttr.isDefSelectedObj; //是否默认选中
+          _this5.nextNode.userInfo = nextUserList;
+          _this5.countersignaturetypeCode = countersignaturetypeCode;
+          _this5.nextNode.countersignaturetypeText = countersignaturetypeText;
+          _this5.isTaskread = nodeExtAttr.isTaskread;
+          _this5.isHandleExplain = nodeExtAttr.isHandleExplain;
+          _this5.isCustomUser = nodeExtAttr.isCustomUser; //是否展示选人组件按钮
+          _this5.presetEdit = nodeExtAttr.presetEdit; //是否展示备选人
+          _this5.isDefSelectedObj = nodeExtAttr.isDefSelectedObj; //是否默认选中
           if (nodeExtAttr.userSelectionType == 7 || nodeExtAttr.userSelectionType == 8 || nodeExtAttr.userSelectionType == 9 || nodeExtAttr.userSelectionType == 10 || nodeExtAttr.userSelectionType == 11 || nodeExtAttr.userSelectionType == 12) {
-            _this4.getIsShowNextUser(nodeExtAttr && nodeExtAttr.userSelectionType);
+            _this5.getIsShowNextUser(nodeExtAttr && nodeExtAttr.userSelectionType);
           } else {
-            var _isMultiple = _this4.isMultiple(nodeExtAttr.userSelectionType),
+            var _isMultiple = _this5.isMultiple(nodeExtAttr.userSelectionType),
                 multiple = _isMultiple.multiple,
                 _params = _isMultiple.params;
 
-            _this4.multiple = multiple;
-            _this4.params = _params;
+            _this5.multiple = multiple;
+            _this5.params = _params;
           }
           // this.isReadMultiple(nodeExtAttr.userSelectionType);
 
           nextUserList.map(function (item) {
-            if (_this4.multiple && nodeExtAttr.isDefSelectedObj == 1 && nextUserList !== undefined) {
-              _this4.nextNode.nextUser.push(item.userId);
-              _this4.selectUserList.push({
+            if (_this5.multiple && nodeExtAttr.isDefSelectedObj == 1 && nextUserList !== undefined) {
+              _this5.nextNode.nextUser.push(item.userId);
+              _this5.selectUserList.push({
                 showname: item.username,
                 showid: item.userId
               });
             }
 
-            _this4.options.push({
+            _this5.options.push({
               showname: item.username,
               showid: item.userId
             });
           });
-          if (_this4.multiple) {
-            _this4.nextNode.nextReadUserId = [];
+          if (_this5.multiple) {
+            _this5.nextNode.nextReadUserId = [];
           } else {
-            _this4.nextNode.nextReadUserId = '';
+            _this5.nextNode.nextReadUserId = '';
           }
-          if (nextUserList.length > 0 && nodeExtAttr.isDefSelectedObj == 1 && !_this4.multiple) {
-            _this4.nextNode.nextUser = nextUserList[0].userId;
-            _this4.selectUserList.push({
+          if (nextUserList.length > 0 && nodeExtAttr.isDefSelectedObj == 1 && !_this5.multiple) {
+            _this5.nextNode.nextUser = nextUserList[0].userId;
+            _this5.selectUserList.push({
               showname: nextUserList[0].username,
               showid: nextUserList[0].userId
             });
           }
-          _this4.radioList = _this4.options;
+          _this5.radioList = _this5.options;
         } else {
-          _this4.$message.error(message || '系统错误，请联系管理员！');
+          _this5.$message.error(message || '系统错误，请联系管理员！');
         }
-        nodeId && _this4.$refs.selectUser[index].changeInfo();
+        nodeId && _this5.$refs.selectUser[index].changeInfo();
       }).catch(function (err) {
-        _this4.loading = false;
+        _this5.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this4.$message.error(err.message);
+          _this5.$message.error(err.message);
         }
       });
     },
@@ -35667,7 +35700,7 @@ var processFormvue_type_script_lang_js_components;
       this.$emit('cancel', false);
     },
     getFind: function getFind() {
-      var _this5 = this;
+      var _this6 = this;
 
       utils_util["a" /* default */].ajax({
         url: api["w" /* findSysCodes */]
@@ -35676,14 +35709,14 @@ var processFormvue_type_script_lang_js_components;
             message = res.message;
 
         if (status === 'success') {
-          _this5.nextNode.noticeType = message.split(',');
+          _this6.nextNode.noticeType = message.split(',');
         } else {
-          _this5.$message.error(message || '系统错误，请联系管理员！');
+          _this6.$message.error(message || '系统错误，请联系管理员！');
         }
       }).catch(function (err) {
-        _this5.loading = false;
+        _this6.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this5.$message.error(err.message);
+          _this6.$message.error(err.message);
         }
       });
     },
@@ -35701,15 +35734,15 @@ var processFormvue_type_script_lang_js_components;
         multiple = true;
       }
       if (val == 1 || val == 2 || val == 5) {
-        params.filid = utils_util["a" /* default */].getStorage('orgId');
+        params.filid = this.userModel.orgId;
         params.only_filid = true;
         if (choiceOrgId) {
           params.filid = choiceOrgId;
         }
       }
       if (val == 5 || val == 6) {
-        params.filid = utils_util["a" /* default */].getStorage('orgId');
-        params.deptid = utils_util["a" /* default */].getStorage('orgId');
+        params.filid = this.userModel.orgId;
+        params.deptid = this.userModel.orgId;
         if (choiceDeptId) {
           params.deptid = choiceDeptId;
         }
@@ -35718,7 +35751,7 @@ var processFormvue_type_script_lang_js_components;
         }
       }
       if (val == 15 || val == 16) {
-        params.filid = utils_util["a" /* default */].getStorage('orgId');
+        params.filid = this.userModel.orgId;
         if (pOrgId) {
           params.filid = pOrgId;
         }
@@ -35726,7 +35759,7 @@ var processFormvue_type_script_lang_js_components;
       return { multiple: multiple, params: params };
     },
     getStartFlow: function getStartFlow(processId) {
-      var _this6 = this;
+      var _this7 = this;
 
       if (!processId) {
         return false;
@@ -35746,80 +35779,80 @@ var processFormvue_type_script_lang_js_components;
             data = res.data;
 
         if (status == 'success') {
-          data.nodeInfoMap.nodeExtAttr.submitTipsMsg && _this6.$confirm(data.nodeInfoMap.nodeExtAttr.submitTipsMsg, '提示', {
+          data.nodeInfoMap.nodeExtAttr.submitTipsMsg && _this7.$confirm(data.nodeInfoMap.nodeExtAttr.submitTipsMsg, '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
           }).then(function () {}).catch(function () {
-            _this6.quit();
+            _this7.quit();
           });
-          _this6.customPresetHintMessage = data.customPresetHintMessage;
-          _this6.nextNode.nodeInfo = data.nextNodeList;
-          _this6.nextNode.nextNode = data.nextNodeList[0].nodeId;
-          _this6.isPreset = data.isPreset;
-          _this6.isHideDefaultOperation = data.nodeInfoMap.nodeExtAttr.isHideDefaultOperation;
-          _this6.defaultNextNode = data.nodeInfoMap.nodeExtAttr.defaultNextNode;
-          _this6.isChooseNextNode = data.nodeInfoMap.nodeExtAttr.isChooseNextNode;
-          _this6.isCdjxjTaskHandle = data.isCdjxjTaskHandle;
-          if (_this6.isChooseNextNode == 1) {
-            _this6.operationList = [{ key: 0, value: '默认', list: [] }, { key: 1, value: '自定义', list: [] }];
+          _this7.customPresetHintMessage = data.customPresetHintMessage;
+          _this7.nextNode.nodeInfo = data.nextNodeList;
+          _this7.nextNode.nextNode = data.nextNodeList[0].nodeId;
+          _this7.isPreset = data.isPreset;
+          _this7.isHideDefaultOperation = data.nodeInfoMap.nodeExtAttr.isHideDefaultOperation;
+          _this7.defaultNextNode = data.nodeInfoMap.nodeExtAttr.defaultNextNode;
+          _this7.isChooseNextNode = data.nodeInfoMap.nodeExtAttr.isChooseNextNode;
+          _this7.isCdjxjTaskHandle = data.isCdjxjTaskHandle;
+          if (_this7.isChooseNextNode == 1) {
+            _this7.operationList = [{ key: 0, value: '默认', list: [] }, { key: 1, value: '自定义', list: [] }];
             var arr = [];
             for (var key in data.taskNodeMap) {
               arr.push({ nodeName: data.taskNodeMap[key], nodeId: key });
             }
-            _this6.operationList[0].list = data.nextNodeList;
-            _this6.operationList[1].list = arr;
-            if (_this6.isHideDefaultOperation != 1) {
-              _this6.nextNode.nextOperate = 0;
-              _this6.nextNode.nodeInfo = _this6.operationList[0].list;
-              if (_this6.nextNode.nodeInfo.length > 0) {
-                _this6.nextNode.nextNode = _this6.defaultNextNode || data.nextNodeList[0].nodeId;
+            _this7.operationList[0].list = data.nextNodeList;
+            _this7.operationList[1].list = arr;
+            if (_this7.isHideDefaultOperation != 1) {
+              _this7.nextNode.nextOperate = 0;
+              _this7.nextNode.nodeInfo = _this7.operationList[0].list;
+              if (_this7.nextNode.nodeInfo.length > 0) {
+                _this7.nextNode.nextNode = _this7.defaultNextNode || data.nextNodeList[0].nodeId;
               }
             } else if (data.nodeInfoMap.nodeExtAttr.defaultNextOperate == 1 || data.nodeInfoMap.nodeExtAttr.isHideDefaultOperation == 1) {
               //  this.nextNode.nodeInfo = data.nextNodeList
-              _this6.nextNode.nextOperate = 1;
-              _this6.nextNode.nodeInfo = _this6.operationList[1].list;
-              if (_this6.nextNode.nodeInfo.length > 0) {
-                _this6.nextNode.nextNode = _this6.defaultNextNode || data.nextNodeList[0].nodeId;
+              _this7.nextNode.nextOperate = 1;
+              _this7.nextNode.nodeInfo = _this7.operationList[1].list;
+              if (_this7.nextNode.nodeInfo.length > 0) {
+                _this7.nextNode.nextNode = _this7.defaultNextNode || data.nextNodeList[0].nodeId;
               }
             }
           }
-          _this6.isCustomPreset = data.isCustomPreset;
-          _this6.presetTaskNodeKeyStr = data.presetTaskNodeKeyStr;
-          _this6.presetTaskNodeMap = data.presetTaskNodeMap;
-          _this6.isSinglePage = data.taskExamine.isSinglePage;
-          _this6.isSinglePage && (_this6.nextNode.opinion = data.taskExamine.opinion);
+          _this7.isCustomPreset = data.isCustomPreset;
+          _this7.presetTaskNodeKeyStr = data.presetTaskNodeKeyStr;
+          _this7.presetTaskNodeMap = data.presetTaskNodeMap;
+          _this7.isSinglePage = data.taskExamine.isSinglePage;
+          _this7.isSinglePage && (_this7.nextNode.opinion = data.taskExamine.opinion);
           // this.nextNode.noticeInfo = data.taskExamine.notificationMsg;
-          _this6.nextNode.nodeName = data.taskExamine.nodeName;
-          _this6.canPresetRead = data.canPresetRead;
+          _this7.nextNode.nodeName = data.taskExamine.nodeName;
+          _this7.canPresetRead = data.canPresetRead;
           if (data.canPresetRead) {
             var ids = data.nodeInfoMap.nodeExtAttr.presetReadCandinateIds.split(',');
             var names = data.nodeInfoMap.nodeExtAttr.presetReadCandinateNames.split(',');
             ids.map(function (item, index) {
-              _this6.presetReadUserId.push({
+              _this7.presetReadUserId.push({
                 showid: item,
                 showname: names[index]
               });
-              _this6.selectPresetUserList.push({
+              _this7.selectPresetUserList.push({
                 showid: item,
                 showname: names[index]
               });
-              _this6.nextNode.presetReadUserId.push(item);
+              _this7.nextNode.presetReadUserId.push(item);
             });
           }
-          _this6.getNodeInfos();
+          _this7.getNodeInfos();
           // this.getPresetFlowInfo();
-          _this6.isCustomPreset && _this6.$refs.customPreset.getPresetFlowInfo(_this6.nextNode.nextNode);
-          _this6.getFind();
-          _this6.getMessage();
-          _this6.getNodeType();
+          _this7.isCustomPreset && _this7.$refs.customPreset.getPresetFlowInfo(_this7.nextNode.nextNode);
+          _this7.getFind();
+          _this7.getMessage();
+          _this7.getNodeType();
         } else {
-          _this6.$message.error(message || '系统错误，请联系管理员！');
+          _this7.$message.error(message || '系统错误，请联系管理员！');
         }
       }).catch(function (err) {
-        _this6.loading = false;
+        _this7.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this6.$message.error(err.message);
+          _this7.$message.error(err.message);
         }
       });
     }
@@ -35837,8 +35870,8 @@ var processFormvue_type_script_lang_js_components;
 
 var processForm_component = normalizeComponent(
   src_processFormvue_type_script_lang_js_,
-  processFormvue_type_template_id_aaac09fe_render,
-  processFormvue_type_template_id_aaac09fe_staticRenderFns,
+  processFormvue_type_template_id_38d27a4e_render,
+  processFormvue_type_template_id_38d27a4e_staticRenderFns,
   false,
   null,
   null,
@@ -47039,8 +47072,8 @@ layout_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var layout = (layout_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=e5e62fc8&
-var mainvue_type_template_id_e5e62fc8_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=44930eda&
+var mainvue_type_template_id_44930eda_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -47557,7 +47590,10 @@ var mainvue_type_template_id_e5e62fc8_render = function () {
                                 ),
                                 _vm.active == 3 && _vm.identifyingId
                                   ? _c("es-qr-code", {
-                                      attrs: { content: _vm.identifyingId },
+                                      attrs: {
+                                        content: _vm.identifyingId,
+                                        logo: _vm.qrimg,
+                                      },
                                     })
                                   : _vm._e(),
                                 _vm.active == 9
@@ -47956,11 +47992,11 @@ var mainvue_type_template_id_e5e62fc8_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_e5e62fc8_staticRenderFns = []
-mainvue_type_template_id_e5e62fc8_render._withStripped = true
+var mainvue_type_template_id_44930eda_staticRenderFns = []
+mainvue_type_template_id_44930eda_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=e5e62fc8&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=44930eda&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=28f463b9&
 var resetPasswordvue_type_template_id_28f463b9_render = function () {
@@ -48866,6 +48902,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 //
 //
 //
+//
 
 
 
@@ -49487,7 +49524,9 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       this.downloadSetup = res.downloadSetup;
       document.title = res.subsystemName;
       this.app = res.appName || res.subsystemName;
-      this.qrimg = res.qrimg || res.qrImg;
+      if (res.qrimg || res.qrImg) {
+        this.qrimg = res.qrimg || res.qrImg;
+      }
       if (res.loginModel) {
         this.loginModel = res.loginModel;
       }
@@ -49972,8 +50011,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_e5e62fc8_render,
-  mainvue_type_template_id_e5e62fc8_staticRenderFns,
+  mainvue_type_template_id_44930eda_render,
+  mainvue_type_template_id_44930eda_staticRenderFns,
   false,
   null,
   null,
@@ -49990,8 +50029,8 @@ login_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var login = (login_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=8fa53c9e&
-var mainvue_type_template_id_8fa53c9e_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=5b54252b&
+var mainvue_type_template_id_5b54252b_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -50418,11 +50457,11 @@ var mainvue_type_template_id_8fa53c9e_render = function () {
     1
   )
 }
-var mainvue_type_template_id_8fa53c9e_staticRenderFns = []
-mainvue_type_template_id_8fa53c9e_render._withStripped = true
+var mainvue_type_template_id_5b54252b_staticRenderFns = []
+mainvue_type_template_id_5b54252b_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=8fa53c9e&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=5b54252b&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=75d533de&
 var userinfovue_type_template_id_75d533de_render = function () {
@@ -52530,10 +52569,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
     //菜单展开关闭
     icons: Object,
     //logo
-    logo: {
-      type: String,
-      default: 'errorlogo'
-    },
+    logo: String,
     //菜单显示类型
     scene: {
       type: String,
@@ -53876,7 +53912,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
         utils_util["a" /* default */].win.open(page);
       } else if (type == 2) {
         location.href = page;
-      } else if (type == 3) {
+      } else if (type == 3 || this.loadWujie === false || this.downgrade && isIE) {
         this.method = 'iframe';
         this.refresh = false;
         this.page = utils_util["a" /* default */].handlerUrl(page, param);
@@ -54265,8 +54301,8 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_8fa53c9e_render,
-  mainvue_type_template_id_8fa53c9e_staticRenderFns,
+  mainvue_type_template_id_5b54252b_render,
+  mainvue_type_template_id_5b54252b_staticRenderFns,
   false,
   null,
   null,
@@ -56459,8 +56495,8 @@ player_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var player = (player_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=template&id=31151606&
-var mainvue_type_template_id_31151606_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=template&id=28375a46&
+var mainvue_type_template_id_28375a46_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -56473,13 +56509,6 @@ var mainvue_type_template_id_31151606_render = function () {
         staticClass: "es-qrcode-img",
         attrs: { width: _vm._width, height: _vm._height, alt: "二维码图片" },
       }),
-      _vm.logo
-        ? _c("img", {
-            ref: "qrcodeLogo",
-            staticClass: "es-qrcode-logo",
-            attrs: { src: _vm.logo, alt: "二维码logo" },
-          })
-        : _vm._e(),
       _c("canvas", {
         ref: "canvas",
         staticClass: "canvas",
@@ -56488,11 +56517,11 @@ var mainvue_type_template_id_31151606_render = function () {
     ]
   )
 }
-var mainvue_type_template_id_31151606_staticRenderFns = []
-mainvue_type_template_id_31151606_render._withStripped = true
+var mainvue_type_template_id_28375a46_staticRenderFns = []
+mainvue_type_template_id_28375a46_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/qr-code/src/main.vue?vue&type=template&id=31151606&
+// CONCATENATED MODULE: ./packages/qr-code/src/main.vue?vue&type=template&id=28375a46&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=script&lang=js&
 //
@@ -56597,7 +56626,7 @@ var QRCode = __webpack_require__(24);
       var _this3 = this;
 
       var qrcodeImg = this.$refs.qrcodeImg;
-      var qrcodeLogo = this.$refs.qrcodeLogo;
+      //let qrcodeLogo = this.$refs.qrcodeLogo;
       var canvas = this.$refs.canvas;
       var option = utils_util["a" /* default */].extend({}, this.option, {
         width: this._width,
@@ -56615,6 +56644,8 @@ var QRCode = __webpack_require__(24);
             //获取图片
             ctx.drawImage(qrcodeImg, 0, 0, _this3._width, _this3._height);
             if (_this3.logo && _this3.logo.indexOf('.') > -1) {
+              var logo = new Image();
+              logo.src = _this3.logo;
               //设置logo大小
               var logoPosition = (_this3._width - 46) / 2; //logo相对于canvas居中定位
               //设置获取的logo将其变为圆角以及添加白色背景
@@ -56632,7 +56663,10 @@ var QRCode = __webpack_require__(24);
               ctx.arcTo(x, y, x + w, y, r);
               ctx.closePath();
               ctx.fill(); */
-              ctx.drawImage(qrcodeLogo, logoPosition, logoPosition, 46, 46);
+              logo.onload = function () {
+                ctx.drawImage(logo, logoPosition, logoPosition, 46, 46);
+                qrcodeImg.src = canvas.toDataURL();
+              };
             } else if (_this3.text) {
               //设置字体
               var fpadd = 10; //规定内间距
@@ -56668,8 +56702,8 @@ var QRCode = __webpack_require__(24);
 
 var qr_code_src_main_component = normalizeComponent(
   packages_qr_code_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_31151606_render,
-  mainvue_type_template_id_31151606_staticRenderFns,
+  mainvue_type_template_id_28375a46_render,
+  mainvue_type_template_id_28375a46_staticRenderFns,
   false,
   null,
   null,
@@ -74032,7 +74066,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.63',
+  version: '0.5.64',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,