ecinc-cloud-mappaio 9.6.110 → 9.6.111

package/lib/ecmappaio.umd.js

@@ -6919,7 +6919,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".van-textarea-field[data-v-67219e88]{p
 
 /***/ }),
 
-/***/ 6246:
+/***/ 5748:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -6933,7 +6933,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".van-input-field[data-v-6ca49595]{position:relative}.van-input-field[data-v-6ca49595]:after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:\" \";pointer-events:none;right:0;bottom:0;left:16px;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.van-field__body_suffix[data-v-6ca49595] .van-field__body:after{color:#323233;content:attr(value-suffix);line-height:22px}.van-field__body_suffix[data-v-6ca49595] .van-field__body .van-field__control{-webkit-box-flex:1;-ms-flex:1;flex:1}[data-v-6ca49595] .van-cell__right-icon{padding-left:10px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".van-input-field[data-v-7c52e668]{position:relative}.van-input-field[data-v-7c52e668]:after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:\" \";pointer-events:none;right:0;bottom:0;left:16px;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.van-field__body_suffix[data-v-7c52e668] .van-field__body:after{color:#323233;content:attr(value-suffix);line-height:22px}.van-field__body_suffix[data-v-7c52e668] .van-field__body .van-field__control{-webkit-box-flex:1;-ms-flex:1;flex:1}[data-v-7c52e668] .van-cell__right-icon{padding-left:10px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -6982,7 +6982,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".van-switch-field[data-v-61ed46da]{pos
 
 /***/ }),
 
-/***/ 3303:
+/***/ 6466:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -6996,7 +6996,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".van-textarea-field[data-v-7096be8f]{position:relative}.van-textarea-field[data-v-7096be8f] .van-field__label{width:90%!important}.van-textarea-field[data-v-7096be8f]:after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:\" \";pointer-events:none;right:0;bottom:0;left:16px;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.richtext-content[data-v-7096be8f]{width:100%;white-space:pre-wrap}.richtext-content[data-v-7096be8f] img{-o-object-fit:contain;object-fit:contain;max-width:100%!important;height:auto!important}.richtext-content-hidden[data-v-7096be8f]{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical}.van-textarea-field[data-v-7096be8f] .field-flSubject .richtext-content,.van-textarea-field[data-v-7096be8f] .field-flSubject textarea.van-field__control{font-size:16px;font-weight:700}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".van-textarea-field[data-v-01eaf0e0]{position:relative}.van-textarea-field[data-v-01eaf0e0] .van-field__label{width:90%!important}.van-textarea-field[data-v-01eaf0e0]:after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:\" \";pointer-events:none;right:0;bottom:0;left:16px;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.richtext-content[data-v-01eaf0e0]{width:100%;white-space:pre-wrap}.richtext-content[data-v-01eaf0e0] img{-o-object-fit:contain;object-fit:contain;max-width:100%!important;height:auto!important}.richtext-content-hidden[data-v-01eaf0e0]{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical}.van-textarea-field[data-v-01eaf0e0] .field-flSubject .richtext-content,.van-textarea-field[data-v-01eaf0e0] .field-flSubject textarea.van-field__control{font-size:16px;font-weight:700}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -7345,7 +7345,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".popup-content[data-v-2e7fed1a]{height
 
 /***/ }),
 
-/***/ 4665:
+/***/ 9119:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7359,7 +7359,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, "[data-v-53b68dec] .van-nav-bar__title{margin-left:16px}.popup-content[data-v-53b68dec]{width:100%;height:calc(100vh - 162px - var(--headerHeight));overflow-y:auto;background:#fff}.popup-content .van-cell-group[data-v-53b68dec]:after{border:none}[data-v-53b68dec] .van-checkbox,[data-v-53b68dec] .van-radio{padding-right:16px}[data-v-53b68dec] .popup-department{width:100%;height:calc(100vh - 106px - var(--headerHeight));overflow-y:auto}[data-v-53b68dec] .popup-department .van-cell-group:after{border:none}[data-v-53b68dec] .van-dropdown-menu__bar{height:34px;background-color:#f7f8fa;-webkit-box-shadow:0 0;box-shadow:0 0;border-top-right-radius:2px;border-bottom-right-radius:2px}[data-v-53b68dec] .van-dropdown-item__option{padding:10px 16px;font-size:15px}[data-v-53b68dec] .van-search__content{border-top-left-radius:0;border-bottom-left-radius:0}[data-v-53b68dec] .iconfont-search input[type=search]{font-family:iconfont}[data-v-53b68dec] .iconfont-search .van-field__left-icon{height:24px}[data-v-53b68dec] .iconfont-search .icon-search{font-size:14px}[data-v-53b68dec] .iconfont-search .icon-search:before{content:\"\\e672\";color:#7d7e80}.p-search[data-v-53b68dec]{position:relative}.p-search[data-v-53b68dec]:after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:\" \";pointer-events:none;right:0;bottom:0;left:0;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.search-staff-result .van-cell-staff[data-v-53b68dec]{padding:14px 16px}.search-staff-result .staff-name[data-v-53b68dec]{margin-top:-20px}.search-staff-result .van-cell__label[data-v-53b68dec]{position:absolute;left:102px;top:34px}.search-staff-result .photo[data-v-53b68dec]{height:38px;width:38px}.search-staff-result .photo span[data-v-53b68dec]{line-height:38px}.photo[data-v-53b68dec]{position:relative;background:#ccc;margin-right:10px;text-align:center}.photo[data-v-53b68dec],.photo img[data-v-53b68dec]{border-radius:50%;width:28px;height:28px}.photo span[data-v-53b68dec]{color:#fff;line-height:30px;font-size:10px}.searchInput[data-v-53b68dec]{position:relative;z-index:1}[data-v-53b68dec] .van-cell__title{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-53b68dec] .select-all-nodes{position:relative}[data-v-53b68dec] .select-all-nodes:after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:\" \";pointer-events:none;right:0;bottom:0;left:0;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}[data-v-53b68dec] .select-all-nodes .van-cell .van-cell__value{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.no-message-img[data-v-53b68dec]{width:100%;text-align:center;margin-top:88px}.no-message-img img[data-v-53b68dec]{width:240px}.no-message-img span[data-v-53b68dec]{line-height:50px;font-size:14px;color:#969799}[data-v-53b68dec] .btn-group-container{background:#f9f9f9}.select_person_count[data-v-53b68dec]{display:-webkit-box;display:-ms-flexbox;display:flex}.select_person_count .count[data-v-53b68dec]{-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:left;line-height:44px;font-size:14px;color:#1989fa}.select_person_count .count span[data-v-53b68dec]{display:inline-block;line-height:30px}.select_person_count .confirm_btn[data-v-53b68dec]{width:100px}.select_person_count .confirm_btn button[data-v-53b68dec]{width:100%}.delete_Popup[data-v-53b68dec]{height:100%}.delete_Popup .popup_header[data-v-53b68dec]{display:-webkit-box;display:-ms-flexbox;display:flex;line-height:50px;position:relative;padding:0 16px}.delete_Popup .popup_header[data-v-53b68dec]:after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:\" \";pointer-events:none;width:100%;bottom:0;left:0;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.delete_Popup .popup_header .title[data-v-53b68dec]{-webkit-box-flex:1;-ms-flex:1;flex:1;font-size:16px;font-weight:700;color:#303133;text-align:left}.delete_Popup .popup_header .btn[data-v-53b68dec]{-webkit-box-flex:1;-ms-flex:1;flex:1;color:#1989fa;font-size:14px;text-align:right}.delete_Popup .popup_person[data-v-53b68dec]{height:calc(100% - 50px);overflow-y:auto;overflow-x:hidden}.delete_Popup .popup_person .popup_cell[data-v-53b68dec]{display:-webkit-box;display:-ms-flexbox;display:flex;position:relative;padding:10px 16px}.delete_Popup .popup_person .popup_cell .name[data-v-53b68dec]{-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:1}.delete_Popup .popup_person .popup_cell[data-v-53b68dec]:not(:last-child):after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:\" \";pointer-events:none;width:100%;bottom:0;left:16px;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.delete_Popup .popup_person .popup_cell .photo[data-v-53b68dec]{width:36px;height:36px}.delete_Popup .popup_person .popup_cell .photo span[data-v-53b68dec]{line-height:36px}.delete_Popup .popup_person .popup_cell .photo img[data-v-53b68dec]{width:36px;height:36px}.delete_Popup .popup_person .popup_cell .deletebtn[data-v-53b68dec]{line-height:36px;font-size:20px;color:#c0c4cc}.disabled-name[data-v-53b68dec]{color:#787878;overflow:hidden;max-width:185px;text-overflow:ellipsis;white-space:nowrap}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "[data-v-0b66e96d] .van-nav-bar__title{margin-left:16px}.popup-content[data-v-0b66e96d]{width:100%;height:calc(100vh - 162px - var(--headerHeight));overflow-y:auto;background:#fff}.popup-content .van-cell-group[data-v-0b66e96d]:after{border:none}[data-v-0b66e96d] .van-checkbox,[data-v-0b66e96d] .van-radio{padding-right:16px}[data-v-0b66e96d] .popup-department{width:100%;height:calc(100vh - 106px - var(--headerHeight));overflow-y:auto}[data-v-0b66e96d] .popup-department .van-cell-group:after{border:none}[data-v-0b66e96d] .van-dropdown-menu__bar{height:34px;background-color:#f7f8fa;-webkit-box-shadow:0 0;box-shadow:0 0;border-top-right-radius:2px;border-bottom-right-radius:2px}[data-v-0b66e96d] .van-dropdown-item__option{padding:10px 16px;font-size:15px}[data-v-0b66e96d] .van-search__content{border-top-left-radius:0;border-bottom-left-radius:0}[data-v-0b66e96d] .iconfont-search input[type=search]{font-family:iconfont}[data-v-0b66e96d] .iconfont-search .van-field__left-icon{height:24px}[data-v-0b66e96d] .iconfont-search .icon-search{font-size:14px}[data-v-0b66e96d] .iconfont-search .icon-search:before{content:\"\\e672\";color:#7d7e80}.p-search[data-v-0b66e96d]{position:relative}.p-search[data-v-0b66e96d]:after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:\" \";pointer-events:none;right:0;bottom:0;left:0;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.search-staff-result .van-cell-staff[data-v-0b66e96d]{padding:14px 16px}.search-staff-result .staff-name[data-v-0b66e96d]{margin-top:-20px}.search-staff-result .van-cell__label[data-v-0b66e96d]{position:absolute;left:102px;top:34px}.search-staff-result .photo[data-v-0b66e96d]{height:38px;width:38px}.search-staff-result .photo span[data-v-0b66e96d]{line-height:38px}.photo[data-v-0b66e96d]{position:relative;background:#ccc;margin-right:10px;text-align:center}.photo[data-v-0b66e96d],.photo img[data-v-0b66e96d]{border-radius:50%;width:28px;height:28px}.photo span[data-v-0b66e96d]{color:#fff;line-height:30px;font-size:10px}.searchInput[data-v-0b66e96d]{position:relative;z-index:1}[data-v-0b66e96d] .van-cell__title{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-0b66e96d] .select-all-nodes{position:relative}[data-v-0b66e96d] .select-all-nodes:after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:\" \";pointer-events:none;right:0;bottom:0;left:0;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}[data-v-0b66e96d] .select-all-nodes .van-cell .van-cell__value{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.no-message-img[data-v-0b66e96d]{width:100%;text-align:center;margin-top:88px}.no-message-img img[data-v-0b66e96d]{width:240px}.no-message-img span[data-v-0b66e96d]{line-height:50px;font-size:14px;color:#969799}[data-v-0b66e96d] .btn-group-container{background:#f9f9f9}.select_person_count[data-v-0b66e96d]{display:-webkit-box;display:-ms-flexbox;display:flex}.select_person_count .count[data-v-0b66e96d]{-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:left;line-height:44px;font-size:14px;color:#1989fa}.select_person_count .count span[data-v-0b66e96d]{display:inline-block;line-height:30px}.select_person_count .confirm_btn[data-v-0b66e96d]{width:100px}.select_person_count .confirm_btn button[data-v-0b66e96d]{width:100%}.delete_Popup[data-v-0b66e96d]{height:100%}.delete_Popup .popup_header[data-v-0b66e96d]{display:-webkit-box;display:-ms-flexbox;display:flex;line-height:50px;position:relative;padding:0 16px}.delete_Popup .popup_header[data-v-0b66e96d]:after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:\" \";pointer-events:none;width:100%;bottom:0;left:0;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.delete_Popup .popup_header .title[data-v-0b66e96d]{-webkit-box-flex:1;-ms-flex:1;flex:1;font-size:16px;font-weight:700;color:#303133;text-align:left}.delete_Popup .popup_header .btn[data-v-0b66e96d]{-webkit-box-flex:1;-ms-flex:1;flex:1;color:#1989fa;font-size:14px;text-align:right}.delete_Popup .popup_person[data-v-0b66e96d]{height:calc(100% - 50px);overflow-y:auto;overflow-x:hidden}.delete_Popup .popup_person .popup_cell[data-v-0b66e96d]{display:-webkit-box;display:-ms-flexbox;display:flex;position:relative;padding:10px 16px}.delete_Popup .popup_person .popup_cell .name[data-v-0b66e96d]{-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:1}.delete_Popup .popup_person .popup_cell[data-v-0b66e96d]:not(:last-child):after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:\" \";pointer-events:none;width:100%;bottom:0;left:16px;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.delete_Popup .popup_person .popup_cell .photo[data-v-0b66e96d]{width:36px;height:36px}.delete_Popup .popup_person .popup_cell .photo span[data-v-0b66e96d]{line-height:36px}.delete_Popup .popup_person .popup_cell .photo img[data-v-0b66e96d]{width:36px;height:36px}.delete_Popup .popup_person .popup_cell .deletebtn[data-v-0b66e96d]{line-height:36px;font-size:20px;color:#c0c4cc}.disabled-name[data-v-0b66e96d]{color:#787878;overflow:hidden;max-width:185px;text-overflow:ellipsis;white-space:nowrap}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -7623,7 +7623,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".submit-handle-container .idea-button-
 
 /***/ }),
 
-/***/ 1948:
+/***/ 6874:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7637,7 +7637,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".wf-nodelogs-container[data-v-449b2c56]{margin-bottom:10px}.wf-nodelogs-container .call-back-file .van-steps[data-v-449b2c56]{height:calc(100% - 60px);overflow-y:auto}.wf-nodelogs-container[data-v-449b2c56] .popup-body/deep/.van-steps .van-step--vertical{padding-right:16px}.wf-nodelogs-container[data-v-449b2c56] .popup-body .active-step-finish .van-step__title{color:#444!important}.wf-nodelogs-container[data-v-449b2c56] .popup-body .active-step-finish .van-step__circle-container{color:#1989fa!important}.wf-nodelogs-container[data-v-449b2c56] .popup-body .active-step-finish .van-step__line{background-color:#ebedf0!important}.wf-nodelogs-container[data-v-449b2c56] .popup-body .elapsed-time{float:right}.wf-nodelogs-container[data-v-449b2c56] .popup-body .licont{color:#969799}.wf-nodelogs-container[data-v-449b2c56] .popup-body .licont .fr{float:right}.wf-nodelogs-container[data-v-449b2c56] .popup-body .van-icon{font-size:18px;background-color:#fff}.wf-nodelogs-container[data-v-449b2c56] .popup-body .handwritingIdea{width:200px}.wf-nodelogs-container[data-v-449b2c56] .popup-body .start-chat{padding-left:5px;padding-right:5px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".wf-nodelogs-container[data-v-0e4921ce]{margin-bottom:10px}.wf-nodelogs-container .call-back-file .van-steps[data-v-0e4921ce]{height:calc(100% - 60px);overflow-y:auto}.wf-nodelogs-container[data-v-0e4921ce] .popup-body/deep/.van-steps .van-step--vertical{padding-right:16px}.wf-nodelogs-container[data-v-0e4921ce] .popup-body .active-step-finish .van-step__title{color:#444!important}.wf-nodelogs-container[data-v-0e4921ce] .popup-body .active-step-finish .van-step__circle-container{color:#1989fa!important}.wf-nodelogs-container[data-v-0e4921ce] .popup-body .active-step-finish .van-step__line{background-color:#ebedf0!important}.wf-nodelogs-container[data-v-0e4921ce] .popup-body .elapsed-time{float:right}.wf-nodelogs-container[data-v-0e4921ce] .popup-body .licont{color:#969799}.wf-nodelogs-container[data-v-0e4921ce] .popup-body .licont .fr{float:right}.wf-nodelogs-container[data-v-0e4921ce] .popup-body .van-icon{font-size:18px;background-color:#fff}.wf-nodelogs-container[data-v-0e4921ce] .popup-body .handwritingIdea{width:200px}.wf-nodelogs-container[data-v-0e4921ce] .popup-body .start-chat{padding-left:5px;padding-right:5px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -10151,7 +10151,7 @@ module.exports.InvalidTokenError = InvalidTokenError;
 
 /***/ }),
 
-/***/ 5533:
+/***/ 7914:
 /***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) {
 
 //! moment.js locale configuration
@@ -24517,8 +24517,8 @@ var map = {
 	"./ar-tn": 9756,
 	"./ar-tn.js": 9756,
 	"./ar.js": 1509,
-	"./az": 5533,
-	"./az.js": 5533,
+	"./az": 7914,
+	"./az.js": 7914,
 	"./be": 8959,
 	"./be.js": 8959,
 	"./bg": 7777,
@@ -32290,19 +32290,19 @@ var update = add("55fc929e", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 1234:
+/***/ 4600:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(6246);
+var content = __webpack_require__(5748);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("0452b4b5", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("1884cef9", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -32338,19 +32338,19 @@ var update = add("be4b9cec", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 3107:
+/***/ 6854:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(3303);
+var content = __webpack_require__(6466);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("5b79e7f0", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("60268625", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -32610,19 +32610,19 @@ var update = add("4b734031", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 4277:
+/***/ 2355:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(4665);
+var content = __webpack_require__(9119);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("5e8a5260", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("e6f6eaf0", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -32818,19 +32818,19 @@ var update = add("f86566e0", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 4280:
+/***/ 606:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(1948);
+var content = __webpack_require__(6874);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("04a2fd48", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("7f6f7608", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -40109,7 +40109,7 @@ var wfengine_install = function install(Vue) {
           if (taskNode.name === $scope.curTN.tnNodeName) {
             curNode = taskNode;
             curNodeIndex = index;
-            if ($scope.wfInstance.passenger.udmNodeUsers) {
+            if ($scope.wfInstance.passenger.udmNodeUsers && (!$scope.curTN.passenger.prarllelTodoCount || $scope.curTN.passenger.prarllelTodoCount === 1)) {
               var nextRoute = null;
               if ($scope.wfInstance.passenger.chartData) {
                 //从流程配置图中获取提交路径、下一节点
@@ -40130,7 +40130,7 @@ var wfengine_install = function install(Vue) {
                       name: path.name,
                       fullName: path.name,
                       taskNodes: [],
-                      type: path.pathType + '' || '0'
+                      type: (path.pathType || 0) + ''
                     };
                     if (nextNodes.length > 0) {
                       nextRoute.taskNodes.push(JSON.parse(JSON.stringify(nextNodes[0])));
@@ -40757,11 +40757,13 @@ var wfengine_install = function install(Vue) {
             message: '请选择处理人。'
           };
         }
-        if ($scope.curTN.tnIdeaIsMust === 1 && $scope.curTN.tnIdeaLabelID !== null && ($scope.submitHandle.curUserIdea === null || $scope.submitHandle.curUserIdea.trim() === '')) {
-          return {
-            code: 'warning',
-            message: '请填写处理意见。'
-          };
+        if ($scope.curTN.tnIdeaLabelID !== null && ($scope.submitHandle.curUserIdea === null || $scope.submitHandle.curUserIdea.trim() === '')) {
+          if ($scope.curTN.tnIdeaIsMust === 1 || $scope.curTN.tnIdeaIsMust === 3 && (selRoute.type == '3' || selRoute.type == '12')) {
+            return {
+              code: 'warning',
+              message: '请填写处理意见。'
+            };
+          }
         }
         if ($scope.curTN.tnIdeaAttachment === 1 || $scope.curTN.tnIdeaAttachment === 8) {
           //1：需要1个意见附件，8：至少1个意见附件
@@ -40783,8 +40785,54 @@ var wfengine_install = function install(Vue) {
           message: '提交处理数据准备完成'
         };
       },
-      checkOuterDeputy: function checkOuterDeputy($scope, params) {
+      checkPrarllelTodoCount: function checkPrarllelTodoCount($scope, params) {
         var _this4 = this;
+        return new Promise(function (resole) {
+          var selRoute = $scope.wfJsonData.routes[$scope.submitHandle.route.index];
+          if ($scope.curTN.passenger.prarllelTodoCount > 1 && selRoute.type === '4') {
+            //检查是否还有其它并行办理人
+            var saveData = {
+              wfInstance: JSON.stringify($scope.wfInstance),
+              curTN: JSON.stringify($scope.curTN)
+            };
+            _this4.$http({
+              method: 'POST',
+              contentType: 'application/x-www-form-urlencoded',
+              data: lib_default().stringify(saveData),
+              params: $scope.$vnode.context.wfParams,
+              url: 'workflow/wfInstance/getUdmNodeUsers'
+            }).then(function (res) {
+              if (res.code === 'success') {
+                if (res.body.prarllelTodoCount === 1) {
+                  $scope.$set($scope.curTN.passenger, 'prarllelTodoCount', 1);
+                  $scope.$set($scope.wfInstance.passenger, 'udmNodeUsers', res.body.udmNodeUsers);
+                  resole({
+                    code: 'retry',
+                    message: '提交路径不可用，请重试。'
+                  });
+                } else {
+                  resole({
+                    code: 'success',
+                    message: '未检测到并行冲突，可继续提交。'
+                  });
+                }
+              } else {
+                resole({
+                  code: 'warning',
+                  message: res.message
+                });
+              }
+            });
+          } else {
+            resole({
+              code: 'success',
+              message: '未检测到并行冲突，可继续提交。'
+            });
+          }
+        });
+      },
+      checkOuterDeputy: function checkOuterDeputy($scope, params) {
+        var _this5 = this;
         return new Promise(function (resole) {
           if ($scope.submitHandle.needCheckOuterDeputy && $scope.submitHandle.needCheckOuterDeputy.length > 0) {
             var nextTNUsers = $scope.submitHandle.needCheckOuterDeputy;
@@ -40834,7 +40882,7 @@ var wfengine_install = function install(Vue) {
                       message: '已选择外出代理人。'
                     });
                   } else {
-                    _this4.$bus.emit('selectOuterDeputys', outerDeputys, $scope.submitHandle.route, resole);
+                    _this5.$bus.emit('selectOuterDeputys', outerDeputys, $scope.submitHandle.route, resole);
                   }
                 } else {
                   resole({
@@ -40855,7 +40903,7 @@ var wfengine_install = function install(Vue) {
         });
       },
       applySubmitTemplate: function applySubmitTemplate($scope, submitTemplate) {
-        var _this5 = this;
+        var _this6 = this;
         if ($scope.curTN.tnIdeaLabelID) {
           $scope.submitHandle.curUserIdea = submitTemplate.curUserIdea;
         }
@@ -40898,7 +40946,7 @@ var wfengine_install = function install(Vue) {
                           self: asyncOrgId.split(',').length > 1
                         } // 查询条件
                       };
-                      _this5.$http(reqParams).then(function (res) {
+                      _this6.$http(reqParams).then(function (res) {
                         if (res.code === 'success') {
                           submitTemplate.route[nodeName].users.forEach(function (user) {
                             for (var j = 0; j < res.body.listdata.length; j++) {
@@ -43002,8 +43050,8 @@ var DatetimePicker_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ var DatetimePicker = (DatetimePicker_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/SelectDialog/src/TreeDialog.vue?vue&type=template&id=53b68dec&scoped=true
-var TreeDialogvue_type_template_id_53b68dec_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/SelectDialog/src/TreeDialog.vue?vue&type=template&id=0b66e96d&scoped=true
+var TreeDialogvue_type_template_id_0b66e96d_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -43294,7 +43342,7 @@ var TreeDialogvue_type_template_id_53b68dec_scoped_true_render = function render
       key: index,
       attrs: {
         "center": "",
-        "is-link": radioPerson.type != undefined && !radioPerson.collapse && (_vm.condition.selectDialog !== 'suborg' || radioPerson.orgLevel < _vm.condition.subOrgLevel),
+        "is-link": radioPerson.type != undefined && !radioPerson.collapse && (_vm.condition.selectDialog !== 'suborg' || radioPerson.orgLevel < _vm.condition.subOrgLevel) && radioPerson.isLink !== false,
         "clickable": ""
       },
       on: {
@@ -43377,7 +43425,7 @@ var TreeDialogvue_type_template_id_53b68dec_scoped_true_render = function render
       key: index,
       attrs: {
         "center": "",
-        "is-link": checkboxPerson.type != undefined && !checkboxPerson.collapse && (_vm.condition.selectDialog !== 'suborg' || checkboxPerson.orgLevel < _vm.condition.subOrgLevel),
+        "is-link": checkboxPerson.type != undefined && !checkboxPerson.collapse && (_vm.condition.selectDialog !== 'suborg' || checkboxPerson.orgLevel < _vm.condition.subOrgLevel) && checkboxPerson.isLink !== false,
         "clickable": ""
       },
       on: {
@@ -43779,7 +43827,7 @@ var TreeDialogvue_type_template_id_53b68dec_scoped_true_render = function render
     }]
   }, [_vm._v("暂无人员")])]) : _vm._e()], 2)])]], 2) : _vm._e()], 1);
 };
-var TreeDialogvue_type_template_id_53b68dec_scoped_true_staticRenderFns = [];
+var TreeDialogvue_type_template_id_0b66e96d_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/vuex/dist/vuex.esm.js
 var vuex_esm = __webpack_require__(5353);
@@ -45249,6 +45297,11 @@ function TreeDialogvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != T
           // 集团内单位人员混选
           reqParams.url = 'base/organMgr/findGroupOrganByOrgCode';
           reqParams.params['orgCode'] = orgCode;
+        } else if (condition.selectDialog === 'allOrg' && condition['org-level'] === '9') {
+          // 集团总部二级部门及直属公司（不含直属公司部门）
+          reqParams.url = 'base/organMgr/findGroupOrganByOrgCode';
+          reqParams.params['orgCode'] = orgCode;
+          reqParams.params['orgMerga'] = condition['org-merga'];
         } else if (condition['org-level'] === '10') {
           //当前单位及直属管理单位
           reqParams.url = 'base/organMgr/findChildOrganByOrgCode';
@@ -45837,7 +45890,16 @@ function TreeDialogvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != T
             node.title = node.nName || node.orgFullName;
             node.type = node.type || 'rootOrg';
           }
-          if (node.type === 'rootOrg') {
+          if (_this5.condition.selectDialog === 'allOrg' && _this5.condition['org-level'] === '9' && node.orgLevel === 1) {
+            // 集团总部二级部门及直属公司（不含直属公司部门）
+            if (node.manageOrgId) {
+              node.isLink = false;
+              node.canSelect = true;
+            } else {
+              node.isLink = true;
+              node.canSelect = false;
+            }
+          } else if (node.type === 'rootOrg') {
             node.isLink = true;
           } else if (node.type === 'suborg') {
             node.canSelect = node.isRealOrg == 1;
@@ -46092,8 +46154,12 @@ function TreeDialogvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != T
         result.forEach(function (item, index) {
           item.index = index;
         });
-        if (['rootorg', 'allNode', 'allOrg', 'allStaff', 'staffExt'].includes(_this.condition.selectDialog)) {
+        if (['rootorg', 'allNode', 'allStaff', 'staffExt'].includes(_this.condition.selectDialog)) {
           result = _this.clearEmptyTreeNode(result);
+        } else if ('allOrg' === _this.condition.selectDialog) {
+          if (!(_this.condition['org-level'] === '9' && _this.condition['org-merga'] === 1)) {
+            result = _this.clearEmptyTreeNode(result);
+          }
         } else if ('staff' === _this.condition.selectDialog) {
           result = _this.clearEmptyOrgNode(result);
         }
@@ -46647,6 +46713,11 @@ function TreeDialogvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != T
           this.selected.push(node);
         }
         return;
+      } else if (this.condition.selectDialog === 'allOrg' && this.condition['org-level'] === '9') {
+        // 集团总部二级部门及直属公司（不含直属公司部门）,直属公司机构不允许展开
+        if (node.manageOrgId) {
+          return;
+        }
       }
       var _this = this;
       if (!this.lazy || node.isLoaded) return callback();
@@ -46657,7 +46728,7 @@ function TreeDialogvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != T
       }
       new Promise( /*#__PURE__*/function () {
         var _ref2 = TreeDialogvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/TreeDialogvue_type_script_lang_js_regeneratorRuntime().mark(function _callee3(resolve, reject) {
-          var reqUrl, result, treeData, treeNodeList, url, params, _result, _treeData3, list, _url, pager, _result2, _treeData4;
+          var reqUrl, result, treeData, treeNodeList, url, params, _result, i, _treeData3, list, _url, pager, _result2, _treeData4;
           return TreeDialogvue_type_script_lang_js_regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
@@ -46692,11 +46763,11 @@ function TreeDialogvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != T
                 treeNodeList = _this.toTreeNodeList(treeData, 'staffExt');
                 if (treeNodeList instanceof Array && !treeNodeList.length) treeNodeList = _this.simplyToTree(treeData); // 兼容 原扁平array转tree业务逻辑限制无数据
                 resolve(treeNodeList[0]);
-                _context3.next = 41;
+                _context3.next = 42;
                 break;
               case 16:
                 if (!(node.type === 'rootOrg' || node.type === 'treeNode')) {
-                  _context3.next = 30;
+                  _context3.next = 31;
                   break;
                 }
                 _this.$toast.loading({
@@ -46724,6 +46795,14 @@ function TreeDialogvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != T
                 }
                 return _context3.abrupt("return", reject(_result.message));
               case 25:
+                if (_this13.condition.selectDialog === 'allOrg' && _this13.condition['org-level'] === '9') {
+                  // 集团总部二级部门及直属公司（不含直属公司部门），排除二级部门以下子机构
+                  for (i = 0; i < _result.body.listdata.length; i++) {
+                    if (_result.body.listdata[i].olevel > 2) {
+                      _result.body.listdata.splice(i--, 1);
+                    }
+                  }
+                }
                 _treeData3 = _result.body.listdata.map(function (data) {
                   data.canSelect = !['staffExt', 'allStaff'].includes(_this13.condition.selectDialog);
                   data.name = data.nName;
@@ -46733,11 +46812,11 @@ function TreeDialogvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != T
                 });
                 list = _this.simplyToTree(_treeData3);
                 resolve(list);
-                _context3.next = 41;
+                _context3.next = 42;
                 break;
-              case 30:
+              case 31:
                 if (!(node.type === 'subOrg')) {
-                  _context3.next = 41;
+                  _context3.next = 42;
                   break;
                 }
                 _this.$toast.loading({
@@ -46750,20 +46829,20 @@ function TreeDialogvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != T
                   pageNum: 1,
                   pageSize: 10000
                 });
-                _context3.next = 36;
+                _context3.next = 37;
                 return _this.$http({
                   method: 'POST',
                   url: _url,
                   data: pager
                 });
-              case 36:
+              case 37:
                 _result2 = _context3.sent;
                 if (!(_result2.code !== 'success')) {
-                  _context3.next = 39;
+                  _context3.next = 40;
                   break;
                 }
                 return _context3.abrupt("return", reject(_result2.message));
-              case 39:
+              case 40:
                 _treeData4 = _result2.body.pageInfo.list.map(function (item) {
                   item.canSelect = true;
                   item.title = item.name;
@@ -46771,7 +46850,7 @@ function TreeDialogvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != T
                   return item;
                 });
                 resolve(_treeData4);
-              case 41:
+              case 42:
               case "end":
                 return _context3.stop();
             }
@@ -47235,9 +47314,9 @@ function TreeDialogvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != T
 });
 ;// CONCATENATED MODULE: ./packages/ecmapp/SelectDialog/src/TreeDialog.vue?vue&type=script&lang=js
  /* harmony default export */ var src_TreeDialogvue_type_script_lang_js = (TreeDialogvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/SelectDialog/src/TreeDialog.vue?vue&type=style&index=0&id=53b68dec&prod&scoped=true&lang=scss
-var TreeDialogvue_type_style_index_0_id_53b68dec_prod_scoped_true_lang_scss = __webpack_require__(4277);
-;// CONCATENATED MODULE: ./packages/ecmapp/SelectDialog/src/TreeDialog.vue?vue&type=style&index=0&id=53b68dec&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/SelectDialog/src/TreeDialog.vue?vue&type=style&index=0&id=0b66e96d&prod&scoped=true&lang=scss
+var TreeDialogvue_type_style_index_0_id_0b66e96d_prod_scoped_true_lang_scss = __webpack_require__(2355);
+;// CONCATENATED MODULE: ./packages/ecmapp/SelectDialog/src/TreeDialog.vue?vue&type=style&index=0&id=0b66e96d&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmapp/SelectDialog/src/TreeDialog.vue
 
@@ -47250,11 +47329,11 @@ var TreeDialogvue_type_style_index_0_id_53b68dec_prod_scoped_true_lang_scss = __
 
 var TreeDialog_component = (0,componentNormalizer/* default */.A)(
   src_TreeDialogvue_type_script_lang_js,
-  TreeDialogvue_type_template_id_53b68dec_scoped_true_render,
-  TreeDialogvue_type_template_id_53b68dec_scoped_true_staticRenderFns,
+  TreeDialogvue_type_template_id_0b66e96d_scoped_true_render,
+  TreeDialogvue_type_template_id_0b66e96d_scoped_true_staticRenderFns,
   false,
   null,
-  "53b68dec",
+  "0b66e96d",
   null
   
 )
@@ -54707,8 +54786,8 @@ var FileField_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ var FileField = (FileField_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/FormField/InputField.vue?vue&type=template&id=6ca49595&scoped=true
-var InputFieldvue_type_template_id_6ca49595_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/FormField/InputField.vue?vue&type=template&id=7c52e668&scoped=true
+var InputFieldvue_type_template_id_7c52e668_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.isShowField ? _c('div', {
@@ -54770,7 +54849,7 @@ var InputFieldvue_type_template_id_6ca49595_scoped_true_render = function render
     }], null, false, 333806362)
   }) : _vm._e()], 1) : _vm._e();
 };
-var InputFieldvue_type_template_id_6ca49595_scoped_true_staticRenderFns = [];
+var InputFieldvue_type_template_id_7c52e668_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./src/global/filters/index.js
 
@@ -55202,6 +55281,9 @@ function InputFieldvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != I
         if (this.field.dialogOrgLevel) {
           condition['org-level'] = this.field.dialogOrgLevel;
         }
+        if (this.field.dialogOrgMerga) {
+          condition['org-merga'] = this.field.dialogOrgMerga;
+        }
         if (this.field.dialogOrgId) {
           if (this.field.dialogOrgId.length !== 32 || this.field.dialogOrgId.indexOf('.') !== -1) {
             //动态部门科室ID表达式，转换成org-id字符串
@@ -55343,9 +55425,9 @@ function InputFieldvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != I
 });
 ;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/FormField/InputField.vue?vue&type=script&lang=js
  /* harmony default export */ var FormField_InputFieldvue_type_script_lang_js = (InputFieldvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/FormField/InputField.vue?vue&type=style&index=0&id=6ca49595&prod&scoped=true&lang=scss
-var InputFieldvue_type_style_index_0_id_6ca49595_prod_scoped_true_lang_scss = __webpack_require__(1234);
-;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/FormField/InputField.vue?vue&type=style&index=0&id=6ca49595&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/FormField/InputField.vue?vue&type=style&index=0&id=7c52e668&prod&scoped=true&lang=scss
+var InputFieldvue_type_style_index_0_id_7c52e668_prod_scoped_true_lang_scss = __webpack_require__(4600);
+;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/FormField/InputField.vue?vue&type=style&index=0&id=7c52e668&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/FormField/InputField.vue
 
@@ -55358,11 +55440,11 @@ var InputFieldvue_type_style_index_0_id_6ca49595_prod_scoped_true_lang_scss = __
 
 var InputField_component = (0,componentNormalizer/* default */.A)(
   FormField_InputFieldvue_type_script_lang_js,
-  InputFieldvue_type_template_id_6ca49595_scoped_true_render,
-  InputFieldvue_type_template_id_6ca49595_scoped_true_staticRenderFns,
+  InputFieldvue_type_template_id_7c52e668_scoped_true_render,
+  InputFieldvue_type_template_id_7c52e668_scoped_true_staticRenderFns,
   false,
   null,
-  "6ca49595",
+  "7c52e668",
   null
   
 )
@@ -55947,8 +56029,8 @@ var SwitchField_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ var SwitchField = (SwitchField_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/FormField/TextareaField.vue?vue&type=template&id=7096be8f&scoped=true
-var TextareaFieldvue_type_template_id_7096be8f_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/FormField/TextareaField.vue?vue&type=template&id=01eaf0e0&scoped=true
+var TextareaFieldvue_type_template_id_01eaf0e0_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.isShowField ? _c('div', {
@@ -56043,7 +56125,7 @@ var TextareaFieldvue_type_template_id_7096be8f_scoped_true_render = function ren
     }
   }, [_vm._v(_vm._s(_vm.textName))])]) : _vm._e()], 1) : _vm._e();
 };
-var TextareaFieldvue_type_template_id_7096be8f_scoped_true_staticRenderFns = [];
+var TextareaFieldvue_type_template_id_01eaf0e0_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/FormField/TextareaField.vue?vue&type=script&lang=js
 function TextareaFieldvue_type_script_lang_js_typeof(o) { "@babel/helpers - typeof"; return TextareaFieldvue_type_script_lang_js_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, TextareaFieldvue_type_script_lang_js_typeof(o); }
@@ -56261,6 +56343,9 @@ function TextareaFieldvue_type_script_lang_js_toPrimitive(t, r) { if ("object" !
         if (this.field.dialogOrgLevel) {
           condition['org-level'] = this.field.dialogOrgLevel;
         }
+        if (this.field.dialogOrgMerga) {
+          condition['org-merga'] = this.field.dialogOrgMerga;
+        }
         if (this.field.dialogOrgId) {
           if (this.field.dialogOrgId.length !== 32 || this.field.dialogOrgId.indexOf('.') !== -1) {
             //动态部门科室ID表达式，转换成org-id字符串
@@ -56416,9 +56501,9 @@ function TextareaFieldvue_type_script_lang_js_toPrimitive(t, r) { if ("object" !
 });
 ;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/FormField/TextareaField.vue?vue&type=script&lang=js
  /* harmony default export */ var FormField_TextareaFieldvue_type_script_lang_js = (TextareaFieldvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/FormField/TextareaField.vue?vue&type=style&index=0&id=7096be8f&prod&scoped=true&lang=scss
-var TextareaFieldvue_type_style_index_0_id_7096be8f_prod_scoped_true_lang_scss = __webpack_require__(3107);
-;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/FormField/TextareaField.vue?vue&type=style&index=0&id=7096be8f&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/FormField/TextareaField.vue?vue&type=style&index=0&id=01eaf0e0&prod&scoped=true&lang=scss
+var TextareaFieldvue_type_style_index_0_id_01eaf0e0_prod_scoped_true_lang_scss = __webpack_require__(6854);
+;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/FormField/TextareaField.vue?vue&type=style&index=0&id=01eaf0e0&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/FormField/TextareaField.vue
 
@@ -56431,11 +56516,11 @@ var TextareaFieldvue_type_style_index_0_id_7096be8f_prod_scoped_true_lang_scss =
 
 var TextareaField_component = (0,componentNormalizer/* default */.A)(
   FormField_TextareaFieldvue_type_script_lang_js,
-  TextareaFieldvue_type_template_id_7096be8f_scoped_true_render,
-  TextareaFieldvue_type_template_id_7096be8f_scoped_true_staticRenderFns,
+  TextareaFieldvue_type_template_id_01eaf0e0_scoped_true_render,
+  TextareaFieldvue_type_template_id_01eaf0e0_scoped_true_staticRenderFns,
   false,
   null,
-  "7096be8f",
+  "01eaf0e0",
   null
   
 )
@@ -63625,8 +63710,8 @@ var SubmitDialog_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ var SubmitDialog = (SubmitDialog_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Wflowform/src/WfNodelogList.vue?vue&type=template&id=449b2c56&scoped=true
-var WfNodelogListvue_type_template_id_449b2c56_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Wflowform/src/WfNodelogList.vue?vue&type=template&id=0e4921ce&scoped=true
+var WfNodelogListvue_type_template_id_0e4921ce_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -63789,7 +63874,7 @@ var WfNodelogListvue_type_template_id_449b2c56_scoped_true_render = function ren
     }
   }, [_vm._v("收 回")])], 1) : _vm._e()], 1), _c('WriteToReadIdea'), _c('ModifyWflogAddUser'), _c('ModifyWflogForwardTodo')], 1);
 };
-var WfNodelogListvue_type_template_id_449b2c56_scoped_true_staticRenderFns = [];
+var WfNodelogListvue_type_template_id_0e4921ce_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Wflowform/src/ModifyWflogAddUser.vue?vue&type=template&id=63d52b03&scoped=true
 var ModifyWflogAddUservue_type_template_id_63d52b03_scoped_true_render = function render() {
@@ -65175,7 +65260,7 @@ var WfNodelogListvue_type_script_lang_js_moment = __webpack_require__(5093);
                   }; //驳回路径对应的历史节点处理人
                   $scope.submitHandle.submitRoute = {
                     name: pathName,
-                    type: 3,
+                    type: '3',
                     taskNodes: [nextTN]
                   }; //驳回提交路径对象
 
@@ -65208,9 +65293,9 @@ var WfNodelogListvue_type_script_lang_js_moment = __webpack_require__(5093);
 });
 ;// CONCATENATED MODULE: ./packages/ecmapp/Wflowform/src/WfNodelogList.vue?vue&type=script&lang=js
  /* harmony default export */ var src_WfNodelogListvue_type_script_lang_js = (WfNodelogListvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Wflowform/src/WfNodelogList.vue?vue&type=style&index=0&id=449b2c56&prod&scoped=true&lang=scss
-var WfNodelogListvue_type_style_index_0_id_449b2c56_prod_scoped_true_lang_scss = __webpack_require__(4280);
-;// CONCATENATED MODULE: ./packages/ecmapp/Wflowform/src/WfNodelogList.vue?vue&type=style&index=0&id=449b2c56&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Wflowform/src/WfNodelogList.vue?vue&type=style&index=0&id=0e4921ce&prod&scoped=true&lang=scss
+var WfNodelogListvue_type_style_index_0_id_0e4921ce_prod_scoped_true_lang_scss = __webpack_require__(606);
+;// CONCATENATED MODULE: ./packages/ecmapp/Wflowform/src/WfNodelogList.vue?vue&type=style&index=0&id=0e4921ce&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmapp/Wflowform/src/WfNodelogList.vue
 
@@ -65223,11 +65308,11 @@ var WfNodelogListvue_type_style_index_0_id_449b2c56_prod_scoped_true_lang_scss =
 
 var WfNodelogList_component = (0,componentNormalizer/* default */.A)(
   src_WfNodelogListvue_type_script_lang_js,
-  WfNodelogListvue_type_template_id_449b2c56_scoped_true_render,
-  WfNodelogListvue_type_template_id_449b2c56_scoped_true_staticRenderFns,
+  WfNodelogListvue_type_template_id_0e4921ce_scoped_true_render,
+  WfNodelogListvue_type_template_id_0e4921ce_scoped_true_staticRenderFns,
   false,
   null,
-  "449b2c56",
+  "0e4921ce",
   null
   
 )