eoss-ui 0.5.34 → 0.5.37

package/lib/eoss-ui.common.js

@@ -1294,6 +1294,7 @@ var getLength = function getLength(text) {
  * @desc:转换明度
  * @author huangbo
  * @date 2022年5月7日
+ * @return {string,array} 元素类名或者id
  **/
 var getLightness = function getLightness($v, $i, $isLight) {
   var $value = $isLight ? $v + $brightnessStep1 * $i : $v - $brightnessStep2 * $i;
@@ -1301,6 +1302,21 @@ var getLightness = function getLightness($v, $i, $isLight) {
   return toFixed($value, 2);
 };
 
+/**
+ * getMainConfig
+ * @desc 获取系统配置
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {function} callback - 回调函数
+ **/
+var getMainConfig = function getMainConfig(callback) {
+  ajax({ url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* mainConfig */ "db"] }).then(function (res) {
+    if (res && res.rCode === 0) {
+      callback(res.results);
+    }
+  }).catch(function () {});
+};
+
 /**
  * getMinute
  * @desc 获取分钟
@@ -2931,6 +2947,7 @@ var watermark = function watermark(option) {
   getHour: getHour,
   getWeekNumber: getWeekNumber,
   getLength: getLength,
+  getMainConfig: getMainConfig,
   getMinute: getMinute,
   getMonth: getMonth,
   getObjectType: getObjectType,
@@ -28593,8 +28610,8 @@ form_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_form = (form_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=2d625847&
-var mainvue_type_template_id_2d625847_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/main.vue?vue&type=template&id=7620c3cc&
+var mainvue_type_template_id_7620c3cc_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -29809,7 +29826,7 @@ var mainvue_type_template_id_2d625847_render = function () {
                                                 },
                                                 [
                                                   _vm._v(
-                                                    "\n             " +
+                                                    "\n            " +
                                                       _vm._s(
                                                         _vm.rejectObj.value
                                                       ) +
@@ -30313,11 +30330,11 @@ var mainvue_type_template_id_2d625847_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_2d625847_staticRenderFns = []
-mainvue_type_template_id_2d625847_render._withStripped = true
+var mainvue_type_template_id_7620c3cc_staticRenderFns = []
+mainvue_type_template_id_7620c3cc_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=2d625847&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=7620c3cc&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=4e1f4030&
 var CommonOpinionsvue_type_template_id_4e1f4030_render = function () {
@@ -31257,8 +31274,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=b6491348&
-var processFormvue_type_template_id_b6491348_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=aaac09fe&
+var processFormvue_type_template_id_aaac09fe_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -31724,11 +31741,11 @@ var processFormvue_type_template_id_b6491348_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_b6491348_staticRenderFns = []
-processFormvue_type_template_id_b6491348_render._withStripped = true
+var processFormvue_type_template_id_aaac09fe_staticRenderFns = []
+processFormvue_type_template_id_aaac09fe_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=b6491348&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=aaac09fe&
 
 // 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 () {
@@ -33640,7 +33657,10 @@ var processFormvue_type_script_lang_js_components;
 
       utils_util["a" /* default */].ajax({
         url: api["u" /* findCodeValues */],
-        params: { ccCode: 'notification_type', userId: utils_util["a" /* default */].getStorage('userId') }
+        params: {
+          ccCode: 'notification_type',
+          userId: utils_util["a" /* default */].getStorage('userId')
+        }
       }).then(function (res) {
         var status = res.status,
             data = res.data;
@@ -33679,6 +33699,9 @@ var processFormvue_type_script_lang_js_components;
 
     // 提交表单
     subProcess: function subProcess(formName) {
+      this.saveProcess(formName);
+    },
+    saveProcess: function saveProcess(formName) {
       var _this3 = this;
 
       this.$refs[formName].validate(function (valid) {
@@ -34018,8 +34041,8 @@ var processFormvue_type_script_lang_js_components;
 
 var processForm_component = normalizeComponent(
   src_processFormvue_type_script_lang_js_,
-  processFormvue_type_template_id_b6491348_render,
-  processFormvue_type_template_id_b6491348_staticRenderFns,
+  processFormvue_type_template_id_aaac09fe_render,
+  processFormvue_type_template_id_aaac09fe_staticRenderFns,
   false,
   null,
   null,
@@ -35032,8 +35055,8 @@ var TimeLimit_component = normalizeComponent(
 )
 
 /* harmony default export */ var TimeLimit = (TimeLimit_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/processReject.vue?vue&type=template&id=b5a52fc0&
-var processRejectvue_type_template_id_b5a52fc0_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/processReject.vue?vue&type=template&id=432cf815&
+var processRejectvue_type_template_id_432cf815_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -35224,11 +35247,11 @@ var processRejectvue_type_template_id_b5a52fc0_render = function () {
     1
   )
 }
-var processRejectvue_type_template_id_b5a52fc0_staticRenderFns = []
-processRejectvue_type_template_id_b5a52fc0_render._withStripped = true
+var processRejectvue_type_template_id_432cf815_staticRenderFns = []
+processRejectvue_type_template_id_432cf815_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=b5a52fc0&
+// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=432cf815&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processReject.vue?vue&type=script&lang=js&
 //
@@ -35380,6 +35403,9 @@ processRejectvue_type_template_id_b5a52fc0_render._withStripped = true
 
     // 提交表单
     subProcess: function subProcess(formName) {
+      this.saveProcess(formName);
+    },
+    saveProcess: function saveProcess(formName) {
       var _this2 = this;
 
       this.$refs[formName].validate(function (valid) {
@@ -35506,8 +35532,8 @@ processRejectvue_type_template_id_b5a52fc0_render._withStripped = true
 
 var processReject_component = normalizeComponent(
   src_processRejectvue_type_script_lang_js_,
-  processRejectvue_type_template_id_b5a52fc0_render,
-  processRejectvue_type_template_id_b5a52fc0_staticRenderFns,
+  processRejectvue_type_template_id_432cf815_render,
+  processRejectvue_type_template_id_432cf815_staticRenderFns,
   false,
   null,
   null,
@@ -37882,6 +37908,10 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -38365,7 +38395,10 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
       utils_util["a" /* default */].ajax({
         url: api["u" /* findCodeValues */],
-        params: { ccCode: 'notification_type', userId: utils_util["a" /* default */].getStorage('userId') }
+        params: {
+          ccCode: 'notification_type',
+          userId: utils_util["a" /* default */].getStorage('userId')
+        }
       }).then(function (res) {
         var status = res.status,
             data = res.data;
@@ -38453,11 +38486,22 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年5月25日
      **/
     rejectBtn: function rejectBtn() {
+      var _this8 = this;
+
       if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-      if (!this.value) {
-        return this.$message.warning('请填写意见');
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit().then(function (next) {
+          if (!_this8.value) {
+            return _this8.$message.warning('请填写意见');
+          }
+          _this8.showReject = true;
+        }).catch(function (e) {});
+      } else {
+        if (!this.value) {
+          return this.$message.warning('请填写意见');
+        }
+        this.showReject = true;
       }
-      this.showReject = true;
     },
 
     /**
@@ -38467,10 +38511,20 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年5月25日
      **/
     taskReadBtn: function taskReadBtn() {
+      var _this9 = this;
+
       // return this.$message.warning('暂未开放！敬请期待');
-      if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-      this.taskReadType = 'create';
-      this.showTaskRead = true;
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit().then(function (next) {
+          if (_this9.value === '') _this9.value = _this9.nodeDefaultRejectOpinion;
+          _this9.taskReadType = 'create';
+          _this9.showTaskRead = true;
+        }).catch(function (e) {});
+      } else {
+        if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+        this.taskReadType = 'create';
+        this.showTaskRead = true;
+      }
     },
 
     /**
@@ -38480,7 +38534,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年5月25日
      **/
     getFind: function getFind() {
-      var _this8 = this;
+      var _this10 = this;
 
       utils_util["a" /* default */].ajax({
         url: api["w" /* findSysCodes */]
@@ -38489,11 +38543,11 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
             message = res.message;
 
         if (status === 'success') {
-          _this8.nextNode.notificationType = message.split(',');
+          _this10.nextNode.notificationType = message.split(',');
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this8.$message.error(err.message);
+          _this10.$message.error(err.message);
         }
       });
     },
@@ -38506,41 +38560,52 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年5月25日
      **/
     endFlows: function endFlows(res) {
-      var _this9 = this;
+      var _this11 = this;
+
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit().then(function (next) {
+          _this11.saveEndFlows(res);
+        }).catch(function (e) {});
+      } else {
+        this.saveEndFlows(res);
+      }
+    },
+    saveEndFlows: function saveEndFlows(res) {
+      var _this12 = this;
 
       this.$confirm('确认' + res.value + '?').then(function () {
         var params = {
           url: api["t" /* endFlowHtml */],
           headers: { Accept: 'application/json,text/plain' },
           method: 'post',
-          data: flow_src_mainvue_type_script_lang_js_extends({}, _this9.endFlowInfo, _this9.nextNode, {
-            opinion: _this9.value,
+          data: flow_src_mainvue_type_script_lang_js_extends({}, _this12.endFlowInfo, _this12.nextNode, {
+            opinion: _this12.value,
             userId: utils_util["a" /* default */].getStorage('userId'),
-            nextUserId: _this9.multiple ? _this9.nextNode.nextUserId.join(',') : _this9.nextNode.nextUserId,
-            addSignUserId: _this9.nextNode.addSignUserId.join(','),
-            customPresetUserJson: JSON.stringify(_this9.presetList),
-            presetUserJson: JSON.stringify(_this9.presetUserJson),
-            removeSignUserId: _this9.nextNode.removeSignUserId.join(','),
-            notificationType: _this9.nextNode.notificationType.join(',')
+            nextUserId: _this12.multiple ? _this12.nextNode.nextUserId.join(',') : _this12.nextNode.nextUserId,
+            addSignUserId: _this12.nextNode.addSignUserId.join(','),
+            customPresetUserJson: JSON.stringify(_this12.presetList),
+            presetUserJson: JSON.stringify(_this12.presetUserJson),
+            removeSignUserId: _this12.nextNode.removeSignUserId.join(','),
+            notificationType: _this12.nextNode.notificationType.join(',')
           })
         };
-        _this9.loading = utils_util["a" /* default */].loading(_this9.$loading, '加载中...');
+        _this12.loading = utils_util["a" /* default */].loading(_this12.$loading, '加载中...');
         utils_util["a" /* default */].ajax(params).then(function (res) {
           var status = res.status,
               message = res.message;
 
-          _this9.loading.close();
+          _this12.loading.close();
           if (status === 'success') {
-            _this9.$message.success('提交成功');
-            _this9.$emit('success');
+            _this12.$message.success('提交成功');
+            _this12.$emit('success');
           } else {
-            _this9.$message.error(message || '系统错误，请联系管理员！');
-            _this9.$emit('error');
+            _this12.$message.error(message || '系统错误，请联系管理员！');
+            _this12.$emit('error');
           }
         }).catch(function (err) {
-          _this9.loading.close();
+          _this12.loading.close();
           if (err.message && err.message !== 'canceled') {
-            _this9.$message.error(err.message);
+            _this12.$message.error(err.message);
           }
         });
       }).catch(function (e) {});
@@ -38635,7 +38700,19 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年9月29日
      **/
     toTakeAdvice: function toTakeAdvice(res) {
-      var _this10 = this;
+      var _this13 = this;
+
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit().then(function (next) {
+          _this13.saveToTakeAdvice(res);
+        }).catch(function (e) {});
+      } else {
+        this.saveToTakeAdvice(res);
+      }
+      // return this.$message.warning('暂未开放！敬请期待');
+    },
+    saveToTakeAdvice: function saveToTakeAdvice(res) {
+      var _this14 = this;
 
       var params = {
         url: api["Z" /* isCanStartSubFlow */],
@@ -38650,19 +38727,18 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       utils_util["a" /* default */].ajax(params).then(function (res) {
         var message = res.message;
 
-        _this10.loading.close();
+        _this14.loading.close();
         if (message == 'success') {
-          _this10.showTaskUnionExamine = true;
+          _this14.showTaskUnionExamine = true;
         } else {
-          _this10.$message.error(message || '系统错误，请联系管理员！');
+          _this14.$message.error(message || '系统错误，请联系管理员！');
         }
       }).catch(function (err) {
-        _this10.loading.close();
+        _this14.loading.close();
         if (err.message && err.message !== 'canceled') {
-          _this10.$message.error(err.message);
+          _this14.$message.error(err.message);
         }
       });
-      // return this.$message.warning('暂未开放！敬请期待');
     },
 
     /**
@@ -38672,7 +38748,15 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年9月29日
      **/
     toStartDraf: function toStartDraf(res) {
-      this.showTaskUnionExamine = true;
+      var _this15 = this;
+
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit().then(function (next) {
+          _this15.showTaskUnionExamine = true;
+        }).catch(function (e) {});
+      } else {
+        this.showTaskUnionExamine = true;
+      }
     },
 
     /**
@@ -38682,7 +38766,15 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年9月29日
      **/
     toSendMsg: function toSendMsg(res) {
-      this.showSendMsg = true;
+      var _this16 = this;
+
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit().then(function (next) {
+          _this16.showSendMsg = true;
+        }).catch(function (e) {});
+      } else {
+        this.showSendMsg = true;
+      }
     },
 
     /**
@@ -38692,9 +38784,19 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年9月29日
      **/
     toTaskReadAndEnd: function toTaskReadAndEnd(res) {
-      if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-      this.taskReadType = 'taskReadAndEnd';
-      this.showTaskRead = true;
+      var _this17 = this;
+
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit().then(function (next) {
+          if (_this17.value === '') _this17.value = _this17.nodeDefaultRejectOpinion;
+          _this17.taskReadType = 'taskReadAndEnd';
+          _this17.showTaskRead = true;
+        }).catch(function (e) {});
+      } else {
+        if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+        this.taskReadType = 'taskReadAndEnd';
+        this.showTaskRead = true;
+      }
     },
 
     /**
@@ -38704,43 +38806,53 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年9月29日
      **/
     rejectAndEnd: function rejectAndEnd(res) {
-      var _this11 = this;
+      var _this18 = this;
+
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit().then(function (next) {
+          _this18.saveRejectAndEnd(res);
+        }).catch(function (e) {});
+      } else {
+        this.saveRejectAndEnd(res);
+      }
+    },
+    saveRejectAndEnd: function saveRejectAndEnd(res) {
+      var _this19 = this;
 
       this.$confirm('确认' + res.value + '?').then(function () {
-        if (_this11.isOpinionRequired == 1 && (_this11.value == '' || !_this11.value)) return _this11.$message.warning('请填写意见');
+        if (_this19.isOpinionRequired == 1 && (_this19.value == '' || !_this19.value)) return _this19.$message.warning('请填写意见');
         var params = {
           url: api["mb" /* rejectAndEnd */],
           headers: { Accept: 'application/json,text/plain' },
           method: 'post',
           data: {
-            opinion: _this11.value,
-            pendingId: _this11.pendingId,
+            opinion: _this19.value,
+            pendingId: _this19.pendingId,
             isSinglePage: false
           }
         };
-        _this11.loading = utils_util["a" /* default */].loading(_this11.$loading, '加载中...');
+        _this19.loading = utils_util["a" /* default */].loading(_this19.$loading, '加载中...');
         utils_util["a" /* default */].ajax(params).then(function (res) {
           var status = res.status,
               message = res.message;
 
-          _this11.loading.close();
+          _this19.loading.close();
           if (status === 'success') {
-            _this11.$message.success('提交成功');
-            _this11.$emit('success');
+            _this19.$message.success('提交成功');
+            _this19.$emit('success');
           } else {
-            _this11.$message.error(message || '系统错误，请联系管理员！');
-            _this11.$emit('error');
+            _this19.$message.error(message || '系统错误，请联系管理员！');
+            _this19.$emit('error');
           }
         }).catch(function (err) {
-          _this11.loading.close();
+          _this19.loading.close();
           if (err.message && err.message !== 'canceled') {
-            _this11.$message.error(err.message);
+            _this19.$message.error(err.message);
           }
         });
       }).catch(function () {
         // on cancel
       });
-      // return this.$message.warning('暂未开放！敬请期待');
     },
 
     /**
@@ -38750,9 +38862,17 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年9月29日
      **/
     toTransfer: function toTransfer(res) {
-      this.taskReadType = 'transfer';
-      this.showTaskRead = true;
-      // return this.$message.warning('暂未开放！敬请期待');
+      var _this20 = this;
+
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit().then(function (next) {
+          _this20.taskReadType = 'transfer';
+          _this20.showTaskRead = true;
+        }).catch(function (e) {});
+      } else {
+        this.taskReadType = 'transfer';
+        this.showTaskRead = true;
+      }
     },
 
     /**
@@ -38762,7 +38882,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年5月25日
      **/
     getNodeInfo: function getNodeInfo() {
-      var _this12 = this;
+      var _this21 = this;
 
       var params = {
         processDefinitionId: this.nodeInfo.nextNode,
@@ -38777,42 +38897,42 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
             message = res.message,
             data = res.data;
 
-        _this12.loading.close();
+        _this21.loading.close();
         if (status === 'success') {
           if (data != null) {
             if (data.nodeExtAttr.userSelectionType == 7 || data.nodeExtAttr.userSelectionType == 8 || data.nodeExtAttr.userSelectionType == 9 || data.nodeExtAttr.userSelectionType == 10 || data.nodeExtAttr.userSelectionType == 11 || data.nodeExtAttr.userSelectionType == 12) {
-              _this12.getIsShowNextUser(data.nodeExtAttr && data.nodeExtAttr.userSelectionType);
+              _this21.getIsShowNextUser(data.nodeExtAttr && data.nodeExtAttr.userSelectionType);
             } else {
-              _this12.isMultiple(data.nodeExtAttr && data.nodeExtAttr.userSelectionType, _this12.choiceOrgId, _this12.choiceDeptId, _this12.pOrgId);
+              _this21.isMultiple(data.nodeExtAttr && data.nodeExtAttr.userSelectionType, _this21.choiceOrgId, _this21.choiceDeptId, _this21.pOrgId);
             }
-            _this12.isReadMultiple(data.nodeExtAttr && data.nodeExtAttr.userSelectionType);
-            _this12.isTaskread = data.nodeExtAttr.isTaskread;
-            _this12.isHandleExplain = data.nodeExtAttr.isHandleExplain;
-            _this12.isLimitedTimeHandling = data.nodeExtAttr.isLimitedTimeHandling;
-            _this12.nodeType = data.nodeExtAttr.nodeType;
+            _this21.isReadMultiple(data.nodeExtAttr && data.nodeExtAttr.userSelectionType);
+            _this21.isTaskread = data.nodeExtAttr.isTaskread;
+            _this21.isHandleExplain = data.nodeExtAttr.isHandleExplain;
+            _this21.isLimitedTimeHandling = data.nodeExtAttr.isLimitedTimeHandling;
+            _this21.nodeType = data.nodeExtAttr.nodeType;
             //如果当前为承办节点/会签节点,则展示本单位外单位办理人选择
-            if (_this12.nodeType === 1 || _this12.nodeType === 2) {
-              _this12.isMainSubProcess === true ? _this12.isNodeShowProcess = true : _this12.isNodeShowProcess = false;
-              _this12.isMainSubProcess === true ? _this12.isMainSubProcess = true : _this12.isMainSubProcess = false;
-              _this12.isNextUser = false;
-              _this12.isHideCurrentOrg = res.data.nodeExtAttr.isHideCurrentOrg == 1 ? false : true; //判断是否隐藏本单位
-              _this12.isHideOtherOrg = res.data.nodeExtAttr.isHideOtherOrg == 1 ? false : true; //判断是否隐藏外单位
+            if (_this21.nodeType === 1 || _this21.nodeType === 2) {
+              _this21.isMainSubProcess === true ? _this21.isNodeShowProcess = true : _this21.isNodeShowProcess = false;
+              _this21.isMainSubProcess === true ? _this21.isMainSubProcess = true : _this21.isMainSubProcess = false;
+              _this21.isNextUser = false;
+              _this21.isHideCurrentOrg = res.data.nodeExtAttr.isHideCurrentOrg == 1 ? false : true; //判断是否隐藏本单位
+              _this21.isHideOtherOrg = res.data.nodeExtAttr.isHideOtherOrg == 1 ? false : true; //判断是否隐藏外单位
             } else {
-              _this12.isHideCurrentOrg = false;
-              _this12.isHideOtherOrg = false;
-              _this12.isNodeShowProcess = false;
-              _this12.isMainSubProcess = false;
-              _this12.isNextUser = true;
+              _this21.isHideCurrentOrg = false;
+              _this21.isHideOtherOrg = false;
+              _this21.isNodeShowProcess = false;
+              _this21.isMainSubProcess = false;
+              _this21.isNextUser = true;
               // this.isMainSubProcess === true
               //   ? (this.isMainSubProcess = true)
               //   : (this.isMainSubProcess = false);
             }
-            _this12.multiple ? _this12.nextNode.nextUserId = [] : _this12.nextNode.nextUserId = '';
-            if (_this12.multiple && data.nodeExtAttr.isDefSelectedObj == 1 && data.nextUserList !== undefined) {
+            _this21.multiple ? _this21.nextNode.nextUserId = [] : _this21.nextNode.nextUserId = '';
+            if (_this21.multiple && data.nodeExtAttr.isDefSelectedObj == 1 && data.nextUserList !== undefined) {
               data.nextUserList.map(function (item) {
                 if (item.userId && item.username) {
-                  _this12.nextNode.nextUserId.push(item.userId);
-                  _this12.selectUserList.push({
+                  _this21.nextNode.nextUserId.push(item.userId);
+                  _this21.selectUserList.push({
                     showname: item.username,
                     showid: item.userId
                   });
@@ -38821,37 +38941,37 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
             }
             data.nextUserList.map(function (item) {
               if (item.userId && item.username) {
-                _this12.options.push({
+                _this21.options.push({
                   showname: item.username,
                   showid: item.userId
                 });
               }
             });
             if (data.nodeExtAttr.presetEdit != 0) {
-              _this12.radioList = _this12.options;
+              _this21.radioList = _this21.options;
             }
-            if (!_this12.multiple && data.nextUserList.length > 0 && data.nodeExtAttr.isDefSelectedObj == 1) {
-              _this12.nextNode.nextUserId = data.nextUserList[0].userId;
-              _this12.selectUserList.push({
+            if (!_this21.multiple && data.nextUserList.length > 0 && data.nodeExtAttr.isDefSelectedObj == 1) {
+              _this21.nextNode.nextUserId = data.nextUserList[0].userId;
+              _this21.selectUserList.push({
                 showname: data.nextUserList[0].username,
                 showid: data.nextUserList[0].userId
               });
             }
-            _this12.isLimitedTimeHandling = data.nodeExtAttr.isLimitedTimeHandling;
-            _this12.isCustomUser = data.nodeExtAttr.isCustomUser;
-            _this12.presetEdit = data.nodeExtAttr.presetEdit;
-            _this12.countersignaturetypeCode = data.countersignaturetypeCode; //是否展示处理方式
-            _this12.handleMode = data.countersignaturetypeText;
-            data.globalNodeType === 'endEvent' ? _this12.endFlow = true : '';
+            _this21.isLimitedTimeHandling = data.nodeExtAttr.isLimitedTimeHandling;
+            _this21.isCustomUser = data.nodeExtAttr.isCustomUser;
+            _this21.presetEdit = data.nodeExtAttr.presetEdit;
+            _this21.countersignaturetypeCode = data.countersignaturetypeCode; //是否展示处理方式
+            _this21.handleMode = data.countersignaturetypeText;
+            data.globalNodeType === 'endEvent' ? _this21.endFlow = true : '';
           }
-          _this12.isCustomPreset && _this12.$refs.customPreset.getPresetFlowInfo(_this12.nextNode.nextNodeId, _this12.nodeInfo.nextNode, true);
+          _this21.isCustomPreset && _this21.$refs.customPreset.getPresetFlowInfo(_this21.nextNode.nextNodeId, _this21.nodeInfo.nextNode, true);
         } else {
-          _this12.$message.error(message || '系统错误，请联系管理员！');
+          _this21.$message.error(message || '系统错误，请联系管理员！');
         }
       }).catch(function (err) {
-        _this12.loading.close();
+        _this21.loading.close();
         if (err.message && err.message !== 'canceled') {
-          _this12.$message.error(err.message);
+          _this21.$message.error(err.message);
         }
       });
     },
@@ -38864,7 +38984,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年5月25日
      **/
     selecNext: function selecNext(val, type, isDef) {
-      var _this13 = this;
+      var _this22 = this;
 
       this.loading = utils_util["a" /* default */].loading(this.$loading, '加载中...');
       if (this.multiple) {
@@ -38895,16 +39015,16 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
         this.operationList.forEach(function (item) {
           if (item.key === val) {
             if (!item.taskNodeList) {
-              _this13.nodeInfos = [];
+              _this22.nodeInfos = [];
             } else {
-              _this13.nodeInfos = item.taskNodeList;
+              _this22.nodeInfos = item.taskNodeList;
             }
             return;
           }
         });
         if (this.defaultNextNode) {
           var defaultNode = this.nodeInfos.filter(function (item) {
-            return item.nodeId == _this13.defaultNextNode;
+            return item.nodeId == _this22.defaultNextNode;
           });
           if (this.nodeInfos.length > 0 && defaultNode.length == 0) {
             this.nextNode.nextNodeId = this.nodeInfos[0].nodeId;
@@ -39010,7 +39130,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年5月25日
      **/
     getHedInfo: function getHedInfo() {
-      var _this14 = this;
+      var _this23 = this;
 
       this.loading = utils_util["a" /* default */].loading(this.$loading, '加载中...');
       var params = {
@@ -39020,7 +39140,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       utils_util["a" /* default */].ajax({ url: api["D" /* getHandleInfoHtml */], params: params }).then(function (res) {
         //pc返回数据
 
-        _this14.loading.close();
+        _this23.loading.close();
         if (res.status === 'success') {
           var _res$data2 = res.data,
               nextNodeList = _res$data2.nextNodeList,
@@ -39048,190 +39168,190 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
               isCdjxjTaskHandle = _res$data2.isCdjxjTaskHandle,
               taskButtonList = _res$data2.taskButtonList;
 
-          _this14.$emit('startTaskRead', res);
-          _this14.currentOrgName = currentOrgName;
-          _this14.otherOrgName = otherOrgName;
-          _this14.endFlowInfo.choiceOrgId = choiceOrgId;
-          _this14.endFlowInfo.choiceDeptId = choiceDeptId;
-          _this14.endFlowInfo.pendingId = _this14.pendingId;
-          _this14.attachedCode = attachedCode;
-          _this14.endFlowInfo.pOrgId = pOrgId;
-          _this14.canPresetRead = canPresetRead;
-          _this14.isCdjxjTaskHandle = isCdjxjTaskHandle;
-          _this14.operationList = taskOperations || [];
-          _this14.customPresetHintMessage = customPresetHintMessage;
+          _this23.$emit('startTaskRead', res);
+          _this23.currentOrgName = currentOrgName;
+          _this23.otherOrgName = otherOrgName;
+          _this23.endFlowInfo.choiceOrgId = choiceOrgId;
+          _this23.endFlowInfo.choiceDeptId = choiceDeptId;
+          _this23.endFlowInfo.pendingId = _this23.pendingId;
+          _this23.attachedCode = attachedCode;
+          _this23.endFlowInfo.pOrgId = pOrgId;
+          _this23.canPresetRead = canPresetRead;
+          _this23.isCdjxjTaskHandle = isCdjxjTaskHandle;
+          _this23.operationList = taskOperations || [];
+          _this23.customPresetHintMessage = customPresetHintMessage;
           if (canPresetRead) {
             var ids = nodeInfoMap.nodeExtAttr.presetReadCandinateIds.split(',');
             var names = nodeInfoMap.nodeExtAttr.presetReadCandinateNames.split(',');
             ids.map(function (item, index) {
-              _this14.presetReadUserId.push({
+              _this23.presetReadUserId.push({
                 showid: item,
                 showname: names[index]
               });
-              _this14.selectPresetUserList.push({
+              _this23.selectPresetUserList.push({
                 showid: item,
                 showname: names[index]
               });
-              _this14.nextNode.presetReadUserId.push(item);
+              _this23.nextNode.presetReadUserId.push(item);
             });
           }
-          if (!_this14.isFlow) _this14.getFile(_this14.pendingId, attachedCode);
+          if (!_this23.isFlow) _this23.getFile(_this23.pendingId, attachedCode);
           if (nextNodeList && nextNodeList.length != 0) {
-            _this14.nextNodeList = nextNodeList;
+            _this23.nextNodeList = nextNodeList;
           }
-          if (canRemoveSignUserList && canRemoveSignUserList.length != 0) _this14.removeUsers = canRemoveSignUserList;
+          if (canRemoveSignUserList && canRemoveSignUserList.length != 0) _this23.removeUsers = canRemoveSignUserList;
           if (taskOperations && taskOperations.length != 0) {
             taskOperations.map(function (item) {
-              if (item.key === 9) _this14.isReject = true;
+              if (item.key === 9) _this23.isReject = true;
               if (item.isSelected) {
-                _this14.nodeInfos = [];
-                _this14.nextNode.nextOperate = item.key;
+                _this23.nodeInfos = [];
+                _this23.nextNode.nextOperate = item.key;
                 if (item.taskNodeList != null) {
-                  _this14.nodeInfos = item.taskNodeList;
+                  _this23.nodeInfos = item.taskNodeList;
                 }
               }
               if (taskOperations.length == 1) {
-                _this14.nodeInfos = [];
-                _this14.nextNode.nextOperate = taskOperations[0].key;
+                _this23.nodeInfos = [];
+                _this23.nextNode.nextOperate = taskOperations[0].key;
                 if (taskOperations[0].taskNodeList != null) {
-                  _this14.nodeInfos = taskOperations[0].taskNodeList;
+                  _this23.nodeInfos = taskOperations[0].taskNodeList;
                 }
               }
             });
-            _this14.selecNext(_this14.nextNode.nextOperate, true, true);
+            _this23.selecNext(_this23.nextNode.nextOperate, true, true);
           }
 
           if (nodeInfoMap && JSON.stringify(nodeInfoMap) != '{}') {
-            _this14.needRetrialAuth = !!nodeInfoMap.nodeExtAttr.isCurrentNodeSubmitNeedRetrialAuth;
+            _this23.needRetrialAuth = !!nodeInfoMap.nodeExtAttr.isCurrentNodeSubmitNeedRetrialAuth;
             if (nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList) {
               var notice = JSON.parse(nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList);
               notice.map(function (x) {
-                _this14.nodeFixedOpinionSelectList.push({ content: x });
+                _this23.nodeFixedOpinionSelectList.push({ content: x });
               });
             }
-            _this14.isCurrentNodeForbiddenChangeCandidate = nodeInfoMap.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
-            _this14.nodeDefaultSubmitOpinion = nodeInfoMap.nodeExtAttr.nodeDefaultSubmitOpinion;
-            _this14.isSubmitButtonShowAgreeAndDisagree = nodeInfoMap.nodeExtAttr.isSubmitButtonShowAgreeAndDisagree;
-            _this14.isBanInputOpinion = nodeInfoMap.nodeExtAttr.isBanInputOpinion;
-            _this14.nodeDefaultRejectOpinion = nodeInfoMap.nodeExtAttr.nodeDefaultRejectOpinion;
-            _this14.isOpinionRequired = nodeInfoMap.nodeExtAttr.isOpinionRequired;
+            _this23.isCurrentNodeForbiddenChangeCandidate = nodeInfoMap.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
+            _this23.nodeDefaultSubmitOpinion = nodeInfoMap.nodeExtAttr.nodeDefaultSubmitOpinion;
+            _this23.isSubmitButtonShowAgreeAndDisagree = nodeInfoMap.nodeExtAttr.isSubmitButtonShowAgreeAndDisagree;
+            _this23.isBanInputOpinion = nodeInfoMap.nodeExtAttr.isBanInputOpinion;
+            _this23.nodeDefaultRejectOpinion = nodeInfoMap.nodeExtAttr.nodeDefaultRejectOpinion;
+            _this23.isOpinionRequired = nodeInfoMap.nodeExtAttr.isOpinionRequired;
             // this.isChooseNextNode = nodeInfoMap.nodeExtAttr.isChooseNextNode;
-            _this14.defaultNextNode = nodeInfoMap.nodeExtAttr.defaultNextNode;
+            _this23.defaultNextNode = nodeInfoMap.nodeExtAttr.defaultNextNode;
             if (nodeInfoMap.nodeExtAttr.defaultNextNode) {
-              var defaultNode = _this14.nodeInfos.filter(function (item) {
+              var defaultNode = _this23.nodeInfos.filter(function (item) {
                 return item.nodeId == nodeInfoMap.nodeExtAttr.defaultNextNode;
               });
-              if (_this14.nodeInfos.length > 0 && defaultNode.length == 0) {
-                _this14.nextNode.nextNodeId = _this14.nodeInfos[0].nodeId;
+              if (_this23.nodeInfos.length > 0 && defaultNode.length == 0) {
+                _this23.nextNode.nextNodeId = _this23.nodeInfos[0].nodeId;
               } else {
-                _this14.nextNode.nextNodeId = nodeInfoMap.nodeExtAttr.defaultNextNode;
+                _this23.nextNode.nextNodeId = nodeInfoMap.nodeExtAttr.defaultNextNode;
               }
-            } else if (_this14.nodeInfos.length > 0) {
-              _this14.nextNode.nextNodeId = _this14.nodeInfos[0].nodeId;
+            } else if (_this23.nodeInfos.length > 0) {
+              _this23.nextNode.nextNodeId = _this23.nodeInfos[0].nodeId;
             }
-            _this14.isForceDisplayDefaultOptionForPrefix = nodeInfoMap.nodeExtAttr.isForceDisplayDefaultOptionForPrefix == 1;
+            _this23.isForceDisplayDefaultOptionForPrefix = nodeInfoMap.nodeExtAttr.isForceDisplayDefaultOptionForPrefix == 1;
             if (nodeInfoMap.nodeExtAttr.submitText) {
-              _this14.btnList.map(function (x) {
+              _this23.btnList.map(function (x) {
                 if (x.event === 'sub') {
                   x.text = nodeInfoMap.nodeExtAttr.submitText;
                 }
               });
             }
           }
-          _this14.choiceOrgId = choiceOrgId;
-          _this14.choiceDeptId = choiceDeptId;
-          _this14.pOrgId = pOrgId;
+          _this23.choiceOrgId = choiceOrgId;
+          _this23.choiceDeptId = choiceDeptId;
+          _this23.pOrgId = pOrgId;
           if (res.data && res.data.isEndUserTask != undefined) {
-            _this14.isEndUserTask = res.data.isEndUserTask;
+            _this23.isEndUserTask = res.data.isEndUserTask;
           }
           if (JSON.stringify(taskExamine) != '{}' && taskExamine) {
-            _this14.nodeInfo.nextNode = taskExamine.processDefinitionId;
-            _this14.NodeName = taskExamine.nodeName;
-            _this14.taskId = taskExamine.taskId;
-            _this14.businessIds = taskExamine.businessId;
-            _this14.appId = taskExamine.appId;
-            _this14.taskExamineInfo = taskExamine;
-            _this14.taskExamineInfo.choiceOrgId = choiceOrgId;
-            _this14.taskExamineInfo.choiceDeptId = choiceDeptId;
-            _this14.endFlowInfo.processType = taskExamine.processType;
-            _this14.endFlowInfo.isReturnSubmitter = taskExamine.isReturnSubmitter;
-            _this14.nextNode.isReturnSubmitter = taskExamine.isReturnSubmitter;
-            _this14.nextNode.isUndertakeReply = taskExamine.isUndertakeReply;
-            _this14.nextNode.isTakeAdviceReply = taskExamine.isTakeAdviceReply;
-            _this14.nextNode.isUndertakeEnd = taskExamine.isUndertakeEnd;
-            _this14.nextNode.isTakeAdviceEnd = taskExamine.isTakeAdviceEnd;
-            _this14.nextNode.isReadDealReply = taskExamine.isReadDealReply;
-            _this14.nextNode.isReadDealEnd = taskExamine.isReadDealEnd;
-            _this14.nextNode.isReturnRejectNode = taskExamine.isReturnRejectNode;
-            _this14.nextNode.isSerialSubmit = taskExamine.isSerialSubmit;
-            _this14.endFlowInfo.isSubFlow = taskExamine.isSubFlow;
-            _this14.endFlowInfo.isUndertakeReply = taskExamine.isUndertakeReply;
-            _this14.endFlowInfo.isUndertakeEnd = taskExamine.isUndertakeEnd;
-            _this14.endFlowInfo.isTakeAdviceEnd = taskExamine.isTakeAdviceEnd;
-            _this14.endFlowInfo.isTakeAdviceReply = taskExamine.isTakeAdviceReply;
-            _this14.endFlowInfo.isReadDealEnd = taskExamine.isReadDealEnd;
-            _this14.endFlowInfo.isReadDealReply = taskExamine.isReadDealReply;
-            _this14.endFlowInfo.isReturnRejectNode = taskExamine.isReturnRejectNode;
-            _this14.endFlowInfo.isSerialSubmit = taskExamine.isSerialSubmit;
+            _this23.nodeInfo.nextNode = taskExamine.processDefinitionId;
+            _this23.NodeName = taskExamine.nodeName;
+            _this23.taskId = taskExamine.taskId;
+            _this23.businessIds = taskExamine.businessId;
+            _this23.appId = taskExamine.appId;
+            _this23.taskExamineInfo = taskExamine;
+            _this23.taskExamineInfo.choiceOrgId = choiceOrgId;
+            _this23.taskExamineInfo.choiceDeptId = choiceDeptId;
+            _this23.endFlowInfo.processType = taskExamine.processType;
+            _this23.endFlowInfo.isReturnSubmitter = taskExamine.isReturnSubmitter;
+            _this23.nextNode.isReturnSubmitter = taskExamine.isReturnSubmitter;
+            _this23.nextNode.isUndertakeReply = taskExamine.isUndertakeReply;
+            _this23.nextNode.isTakeAdviceReply = taskExamine.isTakeAdviceReply;
+            _this23.nextNode.isUndertakeEnd = taskExamine.isUndertakeEnd;
+            _this23.nextNode.isTakeAdviceEnd = taskExamine.isTakeAdviceEnd;
+            _this23.nextNode.isReadDealReply = taskExamine.isReadDealReply;
+            _this23.nextNode.isReadDealEnd = taskExamine.isReadDealEnd;
+            _this23.nextNode.isReturnRejectNode = taskExamine.isReturnRejectNode;
+            _this23.nextNode.isSerialSubmit = taskExamine.isSerialSubmit;
+            _this23.endFlowInfo.isSubFlow = taskExamine.isSubFlow;
+            _this23.endFlowInfo.isUndertakeReply = taskExamine.isUndertakeReply;
+            _this23.endFlowInfo.isUndertakeEnd = taskExamine.isUndertakeEnd;
+            _this23.endFlowInfo.isTakeAdviceEnd = taskExamine.isTakeAdviceEnd;
+            _this23.endFlowInfo.isTakeAdviceReply = taskExamine.isTakeAdviceReply;
+            _this23.endFlowInfo.isReadDealEnd = taskExamine.isReadDealEnd;
+            _this23.endFlowInfo.isReadDealReply = taskExamine.isReadDealReply;
+            _this23.endFlowInfo.isReturnRejectNode = taskExamine.isReturnRejectNode;
+            _this23.endFlowInfo.isSerialSubmit = taskExamine.isSerialSubmit;
             // this.endFlowInfo.isReadDealReply =
             //   taskExamine.isReadDealReplybusinessId;
-            _this14.endFlowInfo.appId = taskExamine.appId;
-            _this14.endFlowInfo.businessId = taskExamine.businessId;
-            _this14.endFlowInfo.processDefinitionId = taskExamine.processDefinitionId;
-            _this14.endFlowInfo.nodeId = taskExamine.nodeId;
+            _this23.endFlowInfo.appId = taskExamine.appId;
+            _this23.endFlowInfo.businessId = taskExamine.businessId;
+            _this23.endFlowInfo.processDefinitionId = taskExamine.processDefinitionId;
+            _this23.endFlowInfo.nodeId = taskExamine.nodeId;
           }
-          if (_this14.nodeName) {
-            _this14.NodeName = _this14.nodeName;
+          if (_this23.nodeName) {
+            _this23.NodeName = _this23.nodeName;
           }
-          _this14.isCanAddSign = isCanAddSign;
-          _this14.processObj = res.data;
-          if (_this14.isCanAddSign) {
-            _this14.nextNode.isAddSign = '2';
+          _this23.isCanAddSign = isCanAddSign;
+          _this23.processObj = res.data;
+          if (_this23.isCanAddSign) {
+            _this23.nextNode.isAddSign = '2';
           }
-          _this14.isCanRemoveSign = isCanRemoveSign;
-          if (_this14.isCanRemoveSign) {
-            _this14.nextNode.isRemoveSign = '2';
+          _this23.isCanRemoveSign = isCanRemoveSign;
+          if (_this23.isCanRemoveSign) {
+            _this23.nextNode.isRemoveSign = '2';
           }
-          _this14.isSpecial = isSpecial;
+          _this23.isSpecial = isSpecial;
 
-          if (!_this14.isOpinionRequired) {
-            _this14.isOpinionRequired = 0;
+          if (!_this23.isOpinionRequired) {
+            _this23.isOpinionRequired = 0;
           }
           // opinion && (this.value = opinion);
-          _this14.nextNode.notificationMsg = defaultNotificationMessage;
-          _this14.moreList = [];
+          _this23.nextNode.notificationMsg = defaultNotificationMessage;
+          _this23.moreList = [];
           if (taskButtonList && taskButtonList.length != 0) {
             taskButtonList.map(function (item) {
               if (item.fun === 'reject()') {
-                _this14.rejectObj = item;
+                _this23.rejectObj = item;
               } else if (item.fun === 'toStartTaskRead()') {
-                _this14.pointsReadingObj = item;
+                _this23.pointsReadingObj = item;
               } else {
-                _this14.moreList.push(item);
+                _this23.moreList.push(item);
               }
             });
           }
-          _this14.isMainSubProcess = res.data.isMainSubProcess == 'true';
-          _this14.isCustomPreset = isCustomPreset;
-          _this14.isPreset = isPreset;
-          _this14.presetTaskNodeMap = presetTaskNodeMap;
-          _this14.presetTaskNodeKeyStr = presetTaskNodeKeyStr;
-          _this14.getFind();
-          _this14.getNodeType();
-          _this14.getNodeInfo();
+          _this23.isMainSubProcess = res.data.isMainSubProcess == 'true';
+          _this23.isCustomPreset = isCustomPreset;
+          _this23.isPreset = isPreset;
+          _this23.presetTaskNodeMap = presetTaskNodeMap;
+          _this23.presetTaskNodeKeyStr = presetTaskNodeKeyStr;
+          _this23.getFind();
+          _this23.getNodeType();
+          _this23.getNodeInfo();
         } else {
           if (res.status === 'taskCompleted') {
-            _this14.$emit('shrink', true);
-            _this14.shrinkAbled = true;
-            _this14.$message.warning(res.message || '系统错误，请联系管理员！');
+            _this23.$emit('shrink', true);
+            _this23.shrinkAbled = true;
+            _this23.$message.warning(res.message || '系统错误，请联系管理员！');
           } else {
-            _this14.$message.error(res.message || '系统错误，请联系管理员！');
+            _this23.$message.error(res.message || '系统错误，请联系管理员！');
           }
         }
       }).catch(function (err) {
-        _this14.loading.close();
+        _this23.loading.close();
         if (err.message && err.message !== 'canceled') {
-          _this14.$message.error(err.message);
+          _this23.$message.error(err.message);
         }
       });
     },
@@ -39282,7 +39402,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年5月25日
      **/
     getProcess: function getProcess() {
-      var _this15 = this;
+      var _this24 = this;
 
       var params = {
         businessId: this.businessId,
@@ -39298,32 +39418,32 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
             message = res.message,
             data = res.data;
 
-        _this15.loading.close();
+        _this24.loading.close();
         if (status === 'success') {
           if (!Object.keys(data).length || data.definitionList && !data.definitionList.length) {
-            _this15.$message.error('流程不存在或未关联对应流程！');
+            _this24.$message.error('流程不存在或未关联对应流程！');
           } else {
-            _this15.nodeInfo.option = data.definitionList;
-            _this15.nodeInfo.nextNode = data.definitionList.filter(function (item) {
-              return item.processDefKey == _this15.defaultProcessKey;
+            _this24.nodeInfo.option = data.definitionList;
+            _this24.nodeInfo.nextNode = data.definitionList.filter(function (item) {
+              return item.processDefKey == _this24.defaultProcessKey;
             });
-            if (_this15.nodeInfo.nextNode.length) {
-              _this15.nodeInfo.nextNode = _this15.nodeInfo.nextNode[0].processDefId;
+            if (_this24.nodeInfo.nextNode.length) {
+              _this24.nodeInfo.nextNode = _this24.nodeInfo.nextNode[0].processDefId;
             } else {
               if (data.definitionList.length == 1) {
-                _this15.nodeInfo.nextNode = data.definitionList[0].processDefId;
+                _this24.nodeInfo.nextNode = data.definitionList[0].processDefId;
               } else {
-                _this15.nodeInfo.nextNode = '';
+                _this24.nodeInfo.nextNode = '';
               }
             }
           }
         } else {
-          _this15.$message.error(message || '系统错误，请联系管理员！');
+          _this24.$message.error(message || '系统错误，请联系管理员！');
         }
       }).catch(function (err) {
-        _this15.loading.close();
+        _this24.loading.close();
         if (err.message && err.message !== 'canceled') {
-          _this15.$message.error(err.message);
+          _this24.$message.error(err.message);
         }
       });
     },
@@ -39335,7 +39455,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年5月25日
      **/
     getPendedhistoryList: function getPendedhistoryList() {
-      var _this16 = this;
+      var _this25 = this;
 
       var params = {
         apprecordId: this.businessIds,
@@ -39348,17 +39468,17 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
             results = res.results;
 
         if (!rCode) {
-          _this16.nextNode.nextUserId = [];
-          _this16.showNews = false;
-          _this16.nextNode.notificationType = [];
-          _this16.pendingId = results[results.length - 1].attachId;
-          _this16.getHedInfo();
+          _this25.nextNode.nextUserId = [];
+          _this25.showNews = false;
+          _this25.nextNode.notificationType = [];
+          _this25.pendingId = results[results.length - 1].attachId;
+          _this25.getHedInfo();
         } else {
-          _this16.$message.error(msg || '系统错误，请联系管理员！');
+          _this25.$message.error(msg || '系统错误，请联系管理员！');
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this16.$message.error(err.message);
+          _this25.$message.error(err.message);
         }
       });
     },
@@ -39372,21 +39492,21 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @date 2022年5月25日
      **/
     subProcess: function subProcess(val) {
-      var _this17 = this;
+      var _this26 = this;
 
       this.$refs['nextNode'].validate(function (valid) {
         if (valid) {
-          if (_this17.isSubmitButtonShowAgreeAndDisagree == 1) {
-            _this17.value = _this17.value.replace(RegExp('不同意。', 'g'), '');
-            _this17.value = _this17.value.replace(RegExp('同意。', 'g'), '');
-            _this17.value = val + _this17.value;
+          if (_this26.isSubmitButtonShowAgreeAndDisagree == 1) {
+            _this26.value = _this26.value.replace(RegExp('不同意。', 'g'), '');
+            _this26.value = _this26.value.replace(RegExp('同意。', 'g'), '');
+            _this26.value = val + _this26.value;
           }
-          if (!_this17.validInfo()) return;
-          if (_this17.beforeSubmit == undefined) {
-            _this17.subFun(_this17.sendData);
+          if (!_this26.validInfo()) return;
+          if (_this26.beforeSubmit == undefined) {
+            _this26.subFun(_this26.sendData);
           } else {
-            _this17.beforeSubmit(1).then(function (next) {
-              _this17.sendData();
+            _this26.beforeSubmit(1).then(function (next) {
+              _this26.sendData();
             }).catch(function (e) {});
           }
         }
@@ -39426,7 +39546,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       return true;
     },
     sendData: function sendData() {
-      var _this18 = this;
+      var _this27 = this;
 
       this.$refs['nextNode'].validate(function () {
         var _ref2 = flow_src_mainvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee(valid) {
@@ -39440,89 +39560,89 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                     break;
                   }
 
-                  if (!_this18.isFlow) {
+                  if (!_this27.isFlow) {
                     _context.next = 3;
                     break;
                   }
 
-                  return _context.abrupt('return', _this18.handleVisible = true);
+                  return _context.abrupt('return', _this27.handleVisible = true);
 
                 case 3:
                   nextUserId = [];
 
-                  if (_this18.multiple) {
-                    _this18.nextNode.nextUserId && _this18.nextNode.nextUserId.map(function (item) {
+                  if (_this27.multiple) {
+                    _this27.nextNode.nextUserId && _this27.nextNode.nextUserId.map(function (item) {
                       return nextUserId.push(item);
                     });
                   }
                   addSignUserId = [];
 
-                  if (_this18.isCanAddSign && _this18.nextNode.isAddSign == '1') {
-                    _this18.nextNode.addSignUserId.map(function (item) {
+                  if (_this27.isCanAddSign && _this27.nextNode.isAddSign == '1') {
+                    _this27.nextNode.addSignUserId.map(function (item) {
                       addSignUserId.push(item);
                     });
                   }
                   removeSignUserId = [];
 
-                  if (_this18.isCanRemoveSign && _this18.nextNode.isRemoveSign == '1') {
-                    _this18.nextNode.removeSignUserId.map(function (item) {
+                  if (_this27.isCanRemoveSign && _this27.nextNode.isRemoveSign == '1') {
+                    _this27.nextNode.removeSignUserId.map(function (item) {
                       removeSignUserId.push(item);
                     });
                   }
                   str = '';
 
-                  if (_this18.value) {
-                    str = _this18.value.replace(/\s+/g, '');
+                  if (_this27.value) {
+                    str = _this27.value.replace(/\s+/g, '');
                   }
-                  if ((!_this18.value || str === '') && _this18.nodeDefaultSubmitOpinion) {
-                    _this18.value = _this18.nodeDefaultSubmitOpinion;
+                  if ((!_this27.value || str === '') && _this27.nodeDefaultSubmitOpinion) {
+                    _this27.value = _this27.nodeDefaultSubmitOpinion;
                   }
-                  if (!_this18.isSpecial) {
-                    delete _this18.nextNode.nextOperate;
-                    delete _this18.nextNode.nextNodeId;
+                  if (!_this27.isSpecial) {
+                    delete _this27.nextNode.nextOperate;
+                    delete _this27.nextNode.nextNodeId;
                   }
-                  if (_this18.nextNode.nextOperate === 9) {
-                    _this18.nextNode.isReturnRejectNode = 1;
-                    _this18.nextNode.processDefinitionId = _this18.processObj.taskExamine.processDefinitionId;
+                  if (_this27.nextNode.nextOperate === 9) {
+                    _this27.nextNode.isReturnRejectNode = 1;
+                    _this27.nextNode.processDefinitionId = _this27.processObj.taskExamine.processDefinitionId;
                   }
-                  if (_this18.nextNode.nextOperate != 0 && _this18.nextNode.nextOperate != 1) {
-                    delete _this18.nextNode.nextNodeId;
+                  if (_this27.nextNode.nextOperate != 0 && _this27.nextNode.nextOperate != 1) {
+                    delete _this27.nextNode.nextNodeId;
                   }
                   _context.next = 17;
-                  return _this18.saveInfo('subMit');
+                  return _this27.saveInfo('subMit');
 
                 case 17:
-                  _this18.loading = utils_util["a" /* default */].loading(_this18.$loading, '加载中...');
+                  _this27.loading = utils_util["a" /* default */].loading(_this27.$loading, '加载中...');
 
                   notificationType = '';
 
-                  notificationType = _this18.nextNode.notificationType.join(',');
+                  notificationType = _this27.nextNode.notificationType.join(',');
                   addSignUserId = addSignUserId.join(',');
                   removeSignUserId = removeSignUserId.join(',');
-                  params = flow_src_mainvue_type_script_lang_js_extends({}, _this18.nextNode, {
-                    pendingId: _this18.pendingId,
-                    opinion: _this18.isForceDisplayDefaultOptionForPrefix && !_this18.value.startsWith(_this18.nodeDefaultSubmitOpinion) ? _this18.nodeDefaultSubmitOpinion + _this18.value : _this18.value,
+                  params = flow_src_mainvue_type_script_lang_js_extends({}, _this27.nextNode, {
+                    pendingId: _this27.pendingId,
+                    opinion: _this27.isForceDisplayDefaultOptionForPrefix && !_this27.value.startsWith(_this27.nodeDefaultSubmitOpinion) ? _this27.nodeDefaultSubmitOpinion + _this27.value : _this27.value,
                     userId: utils_util["a" /* default */].getStorage('userId'),
-                    nextUserId: _this18.multiple ? nextUserId.join(',') : _this18.nextNode.nextUserId,
+                    nextUserId: _this27.multiple ? nextUserId.join(',') : _this27.nextNode.nextUserId,
                     addSignUserId: addSignUserId,
-                    customPresetUserJson: JSON.stringify(_this18.presetList),
-                    presetUserJson: JSON.stringify(_this18.presetUserJson),
+                    customPresetUserJson: JSON.stringify(_this27.presetList),
+                    presetUserJson: JSON.stringify(_this27.presetUserJson),
                     removeSignUserId: removeSignUserId,
-                    nextReadUserId: _this18.readMultiple ? _this18.mixReadList && _this18.mixReadList.join('|') : _this18.nextNode.nextReadUserId,
-                    nextOrgId: !_this18.isShowNextUser ? _this18.multiple ? _this18.mixOrgIdList && _this18.mixOrgIdList.join('|') : _this18.nextNode.nextOrgId : '',
-                    presetReadUserId: _this18.mixPresetList && _this18.mixPresetList.length > 0 ? _this18.mixPresetList.join('|') : _this18.nextNode.presetReadUserId.join(','),
+                    nextReadUserId: _this27.readMultiple ? _this27.mixReadList && _this27.mixReadList.join('|') : _this27.nextNode.nextReadUserId,
+                    nextOrgId: !_this27.isShowNextUser ? _this27.multiple ? _this27.mixOrgIdList && _this27.mixOrgIdList.join('|') : _this27.nextNode.nextOrgId : '',
+                    presetReadUserId: _this27.mixPresetList && _this27.mixPresetList.length > 0 ? _this27.mixPresetList.join('|') : _this27.nextNode.presetReadUserId.join(','),
                     notificationType: notificationType
                   });
 
-                  if (_this18.activeNames != '1') delete params.customPresetUserJson;
-                  if (_this18.nextNode.isRemoveSign != '1') {
+                  if (_this27.activeNames != '1') delete params.customPresetUserJson;
+                  if (_this27.nextNode.isRemoveSign != '1') {
                     delete params.removeSignUserId;
                   }
-                  if (_this18.nextNode.isAddSign != '1') {
+                  if (_this27.nextNode.isAddSign != '1') {
                     delete params.addSignUserId;
                   }
-                  _this18.loading = utils_util["a" /* default */].loading(_this18.$loading, '提交中...');
-                  isEndUserTask = _this18.isEndUserTask, choiceOrgId = _this18.choiceOrgId, choiceDeptId = _this18.choiceDeptId, pOrgId = _this18.pOrgId, taskExamineInfo = _this18.taskExamineInfo, needRetrialAuth = _this18.needRetrialAuth;
+                  _this27.loading = utils_util["a" /* default */].loading(_this27.$loading, '提交中...');
+                  isEndUserTask = _this27.isEndUserTask, choiceOrgId = _this27.choiceOrgId, choiceDeptId = _this27.choiceDeptId, pOrgId = _this27.pOrgId, taskExamineInfo = _this27.taskExamineInfo, needRetrialAuth = _this27.needRetrialAuth;
 
                   params.isEndUserTask = isEndUserTask;
                   params.choiceOrgId = choiceOrgId;
@@ -39539,18 +39659,18 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                     var status = res.status,
                         message = res.message;
 
-                    _this18.loading.close();
+                    _this27.loading.close();
                     if (status === 'success') {
-                      _this18.$message.success('提交成功');
-                      _this18.$emit('success');
+                      _this27.$message.success('提交成功');
+                      _this27.$emit('success');
                     } else {
-                      _this18.$message.error(message || '系统错误，请联系管理员！');
-                      _this18.$emit('error');
+                      _this27.$message.error(message || '系统错误，请联系管理员！');
+                      _this27.$emit('error');
                     }
                   }).catch(function (err) {
-                    _this18.loading.close();
+                    _this27.loading.close();
                     if (err.message && err.message !== 'canceled') {
-                      _this18.$message.error(err.message);
+                      _this27.$message.error(err.message);
                     }
                   }));
 
@@ -39562,7 +39682,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                   return _context.stop();
               }
             }
-          }, _callee, _this18);
+          }, _callee, _this27);
         }));
 
         return function (_x) {
@@ -39616,8 +39736,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
 var flow_src_main_component = normalizeComponent(
   packages_flow_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_2d625847_render,
-  mainvue_type_template_id_2d625847_staticRenderFns,
+  mainvue_type_template_id_7620c3cc_render,
+  mainvue_type_template_id_7620c3cc_staticRenderFns,
   false,
   null,
   null,
@@ -44956,8 +45076,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=e28c2dd0&
-var mainvue_type_template_id_e28c2dd0_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=413b11b3&
+var mainvue_type_template_id_413b11b3_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -45737,7 +45857,7 @@ var mainvue_type_template_id_e28c2dd0_render = function () {
                   [_vm._v(_vm._s(_vm.icpInfo.copyright_unit))]
                 ),
                 _c(
-                  "a",
+                  "span",
                   {
                     staticClass: "es-login-icp-item",
                     style: _vm._copyrightStyle,
@@ -45836,14 +45956,14 @@ var mainvue_type_template_id_e28c2dd0_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_e28c2dd0_staticRenderFns = []
-mainvue_type_template_id_e28c2dd0_render._withStripped = true
+var mainvue_type_template_id_413b11b3_staticRenderFns = []
+mainvue_type_template_id_413b11b3_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=e28c2dd0&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=413b11b3&
 
-// 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=7e3a7461&
-var resetPasswordvue_type_template_id_7e3a7461_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/resetPassword.vue?vue&type=template&id=28f463b9&
+var resetPasswordvue_type_template_id_28f463b9_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -45903,11 +46023,11 @@ var resetPasswordvue_type_template_id_7e3a7461_render = function () {
     1
   )
 }
-var resetPasswordvue_type_template_id_7e3a7461_staticRenderFns = []
-resetPasswordvue_type_template_id_7e3a7461_render._withStripped = true
+var resetPasswordvue_type_template_id_28f463b9_staticRenderFns = []
+resetPasswordvue_type_template_id_28f463b9_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/resetPassword.vue?vue&type=template&id=7e3a7461&
+// CONCATENATED MODULE: ./packages/login/src/resetPassword.vue?vue&type=template&id=28f463b9&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=script&lang=js&
 var resetPasswordvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -46219,7 +46339,7 @@ function resetPasswordvue_type_script_lang_js_objectWithoutProperties(obj, keys)
             _this.checkPassword = new RegExp(results.checkPassword);
           }
           if (results.checkPasswordMsg) {
-            _this.checkPasswordMsg = new RegExp(results.checkPasswordMsg);
+            _this.checkPasswordMsg = results.checkPasswordMsg;
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
@@ -46305,10 +46425,12 @@ function resetPasswordvue_type_script_lang_js_objectWithoutProperties(obj, keys)
           data: data.password,
           key: this.secret
         });
-        data.oldPassword = utils_util["a" /* default */].esmEncrypt({
-          data: data.oldPassword,
-          key: this.secret
-        });
+        if (data.oldPassword) {
+          data.oldPassword = utils_util["a" /* default */].esmEncrypt({
+            data: data.oldPassword,
+            key: this.secret
+          });
+        }
       }
       if (this.activeIndex == '0') {
         data.operationCheckCode = this.operationCheckCode;
@@ -46385,8 +46507,8 @@ function resetPasswordvue_type_script_lang_js_objectWithoutProperties(obj, keys)
 
 var resetPassword_component = normalizeComponent(
   src_resetPasswordvue_type_script_lang_js_,
-  resetPasswordvue_type_template_id_7e3a7461_render,
-  resetPasswordvue_type_template_id_7e3a7461_staticRenderFns,
+  resetPasswordvue_type_template_id_28f463b9_render,
+  resetPasswordvue_type_template_id_28f463b9_staticRenderFns,
   false,
   null,
   null,
@@ -47138,6 +47260,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     } else {
       this.getLogin();
       document.addEventListener('keyup', this.doLogin);
+      document.addEventListener('keydown', this.forbiddenTab);
     }
   },
   mounted: function mounted() {
@@ -47794,10 +47917,16 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     },
     handleSuccess: function handleSuccess() {
       this.showResetPassword = false;
+    },
+    forbiddenTab: function forbiddenTab(e) {
+      if (e.keyCode == 9) {
+        return false;
+      }
     }
   },
   beforeDestroy: function beforeDestroy() {
     document.removeEventListener('keyup', this.doLogin);
+    document.removeEventListener('keydown', this.forbiddenTab);
   }
 });
 // CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=script&lang=js&
@@ -47812,8 +47941,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_e28c2dd0_render,
-  mainvue_type_template_id_e28c2dd0_staticRenderFns,
+  mainvue_type_template_id_413b11b3_render,
+  mainvue_type_template_id_413b11b3_staticRenderFns,
   false,
   null,
   null,
@@ -47830,8 +47959,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=79a0b910&
-var mainvue_type_template_id_79a0b910_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=31c26b8e&
+var mainvue_type_template_id_31c26b8e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -48256,14 +48385,14 @@ var mainvue_type_template_id_79a0b910_render = function () {
     1
   )
 }
-var mainvue_type_template_id_79a0b910_staticRenderFns = []
-mainvue_type_template_id_79a0b910_render._withStripped = true
+var mainvue_type_template_id_31c26b8e_staticRenderFns = []
+mainvue_type_template_id_31c26b8e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=79a0b910&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=31c26b8e&
 
-// 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=356fcf36&
-var userinfovue_type_template_id_356fcf36_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/userinfo.vue?vue&type=template&id=137dd243&
+var userinfovue_type_template_id_137dd243_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -48279,11 +48408,11 @@ var userinfovue_type_template_id_356fcf36_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_356fcf36_staticRenderFns = []
-userinfovue_type_template_id_356fcf36_render._withStripped = true
+var userinfovue_type_template_id_137dd243_staticRenderFns = []
+userinfovue_type_template_id_137dd243_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=356fcf36&
+// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=137dd243&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=script&lang=js&
 //
@@ -48513,7 +48642,7 @@ userinfovue_type_template_id_356fcf36_render._withStripped = true
             _this2.checkPassword = new RegExp(results.checkPassword);
           }
           if (results.checkPasswordMsg) {
-            _this2.checkPasswordMsg = new RegExp(results.checkPasswordMsg);
+            _this2.checkPasswordMsg = results.checkPasswordMsg;
           }
           _this2.results = results.simpleUserInfo;
           _this2.values.orgName = results.simpleUserInfo.orgName;
@@ -48699,8 +48828,8 @@ userinfovue_type_template_id_356fcf36_render._withStripped = true
 
 var userinfo_component = normalizeComponent(
   src_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_356fcf36_render,
-  userinfovue_type_template_id_356fcf36_staticRenderFns,
+  userinfovue_type_template_id_137dd243_render,
+  userinfovue_type_template_id_137dd243_staticRenderFns,
   false,
   null,
   null,
@@ -50933,6 +51062,9 @@ var log = utils_util["a" /* default */].getParams('console');
           sessionStorage.setItem('sysLogoIco', results[i]);
           utils_util["a" /* default */].setFavicon(results[i]);
         }
+        if (i === 'subsystemExtend' && results[i].themeColor) {
+          this.color = unescape(results[i].themeColor).toLowerCase();
+        }
         if (i === 'userStyle' && results[i].color) {
           this.color = unescape(results[i].color).toLowerCase();
         }
@@ -50975,21 +51107,12 @@ var log = utils_util["a" /* default */].getParams('console');
         }
         return true;
       }
-      utils_util["a" /* default */].ajax({ url: this.mainConfig }).then(function (res) {
-        if (res && res.rCode === 0) {
-          _this3.setConfig(res.results, 1);
-          if (_this3.remote) {
-            _this3.getMenu();
-          } else {
-            _this3.renderMenu();
-          }
+      utils_util["a" /* default */].getMainConfig(function (res) {
+        _this3.setConfig(res, 1);
+        if (_this3.remote) {
+          _this3.getMenu();
         } else {
-          var msg = res.msg || '系统错误，请联系管理员！';
-          _this3.$message.error(msg);
-        }
-      }).catch(function (err) {
-        if (err.message && err.message !== 'canceled') {
-          _this3.$message.error(err.message);
+          _this3.renderMenu();
         }
       });
     },
@@ -52031,8 +52154,8 @@ var log = utils_util["a" /* default */].getParams('console');
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_79a0b910_render,
-  mainvue_type_template_id_79a0b910_staticRenderFns,
+  mainvue_type_template_id_31c26b8e_render,
+  mainvue_type_template_id_31c26b8e_staticRenderFns,
   false,
   null,
   null,
@@ -65416,8 +65539,8 @@ toolbar_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_toolbar = (toolbar_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/table.vue?vue&type=template&id=b5a1829e&
-var tablevue_type_template_id_b5a1829e_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/table.vue?vue&type=template&id=0cd27751&
+var tablevue_type_template_id_0cd27751_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -65585,7 +65708,8 @@ var tablevue_type_template_id_b5a1829e_render = function () {
                                         class: {
                                           "es-align-middle": item.labelRow,
                                           "is-required":
-                                            _vm.required &&
+                                            item.rules &&
+                                            item.rules.required &&
                                             !_vm.hideRequiredAsterisk,
                                           "required-after": _vm.after,
                                         },
@@ -68071,11 +68195,11 @@ var tablevue_type_template_id_b5a1829e_render = function () {
     2
   )
 }
-var tablevue_type_template_id_b5a1829e_staticRenderFns = []
-tablevue_type_template_id_b5a1829e_render._withStripped = true
+var tablevue_type_template_id_0cd27751_staticRenderFns = []
+tablevue_type_template_id_0cd27751_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=b5a1829e&
+// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=0cd27751&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/table.vue?vue&type=script&lang=js&
 var src_tablevue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -69140,6 +69264,7 @@ var src_tablevue_type_script_lang_js_extends = Object.assign || function (target
 //
 //
 //
+//
 
 
 
@@ -69456,8 +69581,8 @@ var src_tablevue_type_script_lang_js_extends = Object.assign || function (target
 
 var form_src_table_component = normalizeComponent(
   packages_form_src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_b5a1829e_render,
-  tablevue_type_template_id_b5a1829e_staticRenderFns,
+  tablevue_type_template_id_0cd27751_render,
+  tablevue_type_template_id_0cd27751_staticRenderFns,
   false,
   null,
   null,
@@ -71420,7 +71545,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.34',
+  version: '0.5.37',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,