eoss-ui 0.4.50 → 0.4.52

package/lib/wxlogin.js

@@ -351,9 +351,9 @@ var ajax = function ajax(_ref) {
     if (!mix) {
       params = {};
     }
-    if (format && !headers) {
+    if (format && !header['content-type']) {
       data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
-      header['content-type'] = 'application/x-www-form-urlencoded';
+      header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
   }
   return http({
@@ -2348,120 +2348,122 @@ var watermark = function watermark(option) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "j", function() { return doCaLogin; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "m", function() { return doUserLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "n", function() { return doUserLogin; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "l", function() { return doQrLogin; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "V", function() { return logout; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Q", function() { return initLogin; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lb", function() { return switchUserTo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "X", function() { return logout; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "S", function() { return initLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "nb", function() { return switchUserTo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return changeImg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "B", function() { return getLoginCode; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "C", function() { return getLoginCode; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "k", function() { return doCodeLogin; });
 /* unused harmony export updateCode */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "C", function() { return getModifyPassCode; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "D", function() { return getModifyPassCode; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return codeModifyPass; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return authCenter; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "R", function() { return initModifyPassword; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "n", function() { return doWechatQrLogin; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "W", function() { return mainConfig; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "S", function() { return initUserSet; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ob", function() { return updateUserInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "T", function() { return initModifyPassword; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "o", function() { return doWechatQrLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "N", function() { return getTwoFactorLoginCode; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "m", function() { return doTwoFactorLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Y", function() { return mainConfig; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return initUserSet; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Qb", function() { return updateUserInfo; });
 /* unused harmony export getUserImgUrl */
 /* unused harmony export getDoorIndex */
 /* unused harmony export refreshOnlineUsers */
 /* unused harmony export getQuickMenuIds */
 /* unused harmony export getApplicationIdArray */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "y", function() { return getComplexApplications; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "z", function() { return getComplexApplicationsNew; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "z", function() { return getComplexApplications; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "A", function() { return getComplexApplicationsNew; });
 /* unused harmony export getUserCustomInfo */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Nb", function() { return updateUserCustomInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mb", function() { return sysMsgPage; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "P", function() { return ignoreSysMsg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "O", function() { return ignoreAllSysMsg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "x", function() { return getAdjunctProperties; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Sb", function() { return uploads; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Qb", function() { return uploadOnlyOne; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "w", function() { return getAdjunctFileInfos; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Rb", function() { return uploadSort; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "o", function() { return downloadByAdjunctId; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Pb", function() { return uploadDownloads; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bb", function() { return previewAdjunct; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cb", function() { return previewAdjunct2; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return previewAdjunctOffice; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Pb", function() { return updateUserCustomInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ob", function() { return sysMsgPage; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "R", function() { return ignoreSysMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Q", function() { return ignoreAllSysMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "y", function() { return getAdjunctProperties; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ub", function() { return uploads; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Sb", function() { return uploadOnlyOne; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "x", function() { return getAdjunctFileInfos; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return uploadSort; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "p", function() { return downloadByAdjunctId; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Rb", function() { return uploadDownloads; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return previewAdjunct; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "eb", function() { return previewAdjunct2; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fb", function() { return previewAdjunctOffice; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return delAdjunct; });
 /* unused harmony export upload_updateClassify */
 /* unused harmony export getDeleteAdjunctFileInfos */
 /* unused harmony export getPictureBase64 */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return getSelectorOrgTree; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return getSelectorOrgDetail; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "F", function() { return getOrgMainTree; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "J", function() { return getSelectOrgsubids; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "s", function() { return findSysCode; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "M", function() { return getSelectorOrgTree; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return getSelectorOrgDetail; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "G", function() { return getOrgMainTree; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return getSelectOrgsubids; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return findSysCode; });
 /* unused harmony export findUserBaseInfo */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "M", function() { return gethelpdoc; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "O", function() { return gethelpdoc; });
 /* unused harmony export getCurrentuser */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "X", function() { return mainDetail; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zb", function() { return toStartFlow; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "wb", function() { return tempSave; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Z", function() { return mainDetail; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Bb", function() { return toStartFlow; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yb", function() { return tempSave; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return commonOpion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return addCommonOpion; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "p", function() { return editCommonOpion; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gb", function() { return saveCommonOpinion; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Mb", function() { return updateCommonOpinion; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "q", function() { return editCommonOpion; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ib", function() { return saveCommonOpinion; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ob", function() { return updateCommonOpinion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "g", function() { return deleteCommonOpion; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "I", function() { return getProcessDefList; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "D", function() { return getNodeInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "r", function() { return findCodeValues; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "u", function() { return findSysParam; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return findSysCodes; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "E", function() { return getNotificationMsg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "A", function() { return getHandleInfoHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "nb", function() { return taskHandleHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "J", function() { return getProcessDefList; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "E", function() { return getNodeInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "s", function() { return findCodeValues; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "v", function() { return findSysParam; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "u", function() { return findSysCodes; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "F", function() { return getNotificationMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "B", function() { return getHandleInfoHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return taskHandleHtml; });
 /* unused harmony export getView */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "eb", function() { return register; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Y", function() { return pendedhistoryList; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Cb", function() { return toTaskRejectHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return taskRejectHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ab", function() { return toStartTaskRead; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Bb", function() { return toStartTaskReadIndex; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ob", function() { return taskReadHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fb", function() { return rejectAndEnd; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yb", function() { return toSendMsg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "kb", function() { return sendMsg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "q", function() { return endFlowHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "N", function() { return handleInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return loginUserInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return wss; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kb", function() { return topic; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "G", function() { return getPresetCustomInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "H", function() { return getPresetNodeInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Gb", function() { return toTaskTransferIndex; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tb", function() { return taskTransfer; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "xb", function() { return toPresetInfoListIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gb", function() { return register; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return pendedhistoryList; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Eb", function() { return toTaskRejectHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rb", function() { return taskRejectHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Cb", function() { return toStartTaskRead; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Db", function() { return toStartTaskReadIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "qb", function() { return taskReadHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hb", function() { return rejectAndEnd; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ab", function() { return toSendMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mb", function() { return sendMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "r", function() { return endFlowHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "P", function() { return handleInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "W", function() { return loginUserInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Vb", function() { return wss; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Mb", function() { return topic; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "H", function() { return getPresetCustomInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "I", function() { return getPresetNodeInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ib", function() { return toTaskTransferIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "vb", function() { return taskTransfer; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zb", function() { return toPresetInfoListIndex; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "i", function() { return deletePresetInfo; });
 /* unused harmony export historyListJson */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Z", function() { return pendedhistoryListJson; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return pressListJson; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bb", function() { return pendedhistoryListJson; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cb", function() { return pressListJson; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "h", function() { return deleteFlow; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "T", function() { return isCanStartSubFlow; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Hb", function() { return toTaskUnionExamine; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ub", function() { return taskUnionExamine; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Fb", function() { return toTaskTakeAdvice; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sb", function() { return taskTakeAdvice; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Eb", function() { return toTaskStartDraft; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rb", function() { return taskStartDraft; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Db", function() { return toTaskReview; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "qb", function() { return taskReview; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ib", function() { return toTaskUnionSeal; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "vb", function() { return taskUnionSeal; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Jb", function() { return toTwoOfficesDispatch; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Lb", function() { return twoOfficesDispatch; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "jb", function() { return sendList; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ib", function() { return sendInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "V", function() { return isCanStartSubFlow; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Jb", function() { return toTaskUnionExamine; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "wb", function() { return taskUnionExamine; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Hb", function() { return toTaskTakeAdvice; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ub", function() { return taskTakeAdvice; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Gb", function() { return toTaskStartDraft; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tb", function() { return taskStartDraft; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Fb", function() { return toTaskReview; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sb", function() { return taskReview; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kb", function() { return toTaskUnionSeal; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "xb", function() { return taskUnionSeal; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Lb", function() { return toTwoOfficesDispatch; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Nb", function() { return twoOfficesDispatch; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lb", function() { return sendList; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "kb", function() { return sendInfo; });
 /* unused harmony export sendSave */
 /* unused harmony export sendUpdate */
 /* unused harmony export sendDelete */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hb", function() { return sendBatch; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "v", function() { return formContents; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "jb", function() { return sendBatch; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "w", function() { return formContents; });
 // 登录
 var doCaLogin = '/sso2/signIn/auth/doCaLogin'; // ca登录认证
 var doUserLogin = '/sso2/signIn/auth/doUserLogin'; // 一般的账号密码认证含验证码验证
@@ -2478,6 +2480,8 @@ var codeModifyPass = '/sso2/signIn/assembly/codeModifyPass'; // 验证码重置
 var authCenter = '/sso2/authCenter/login'; // 单点登录认证中心
 var initModifyPassword = '/sso2/signIn/assembly/initModifyPassword'; // 初始化密码修改信息
 var doWechatQrLogin = '/sso2/signIn/auth/doWechatQrLogin'; // 微信扫码登录
+var getTwoFactorLoginCode = '/sso2/signIn/auth/getTwoFactorLoginCode'; // 双因素登录，通过消息中心发送登陆验证码给用户
+var doTwoFactorLogin = '/sso2/signIn/auth/doTwoFactorLogin'; // 双因素登录
 // 框架
 var mainConfig = '/main2/main/mainConfig'; // 获取主页面配置
 var initUserSet = '/main2/main/initUserSet'; // 获取用户信息

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.50",
+  "version": "0.4.52",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/flow/src/main.vue

@@ -20,7 +20,7 @@
           >填写意见</span
         >
         <span
-          v-show="!isFlow && typeCode != 'fenyue'"
+          v-show="!isFlow && newTypeCode != 'fenyue'"
           class="es-opinion-file"
           @click="showFileList = true"
           ><i class="es-icon-fujian"></i>意见附件<span
@@ -42,7 +42,7 @@
     </div>
     <div
       v-show="
-        (!endFlow || nodeInfos.length > 1) && typeCode != 'fenyue' && !shrink
+        (!endFlow || nodeInfos.length > 1) && newTypeCode != 'fenyue' && !shrink
       "
       class="es-info"
     >
@@ -179,8 +179,9 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <div v-if="!isReject && nodeInfos.length != 0">
+            <div>
               <el-form-item
+                v-if="!isReject && nodeInfos.length != 0 && isShowNode"
                 prop="nextNodeId"
                 label="下步节点"
                 :rules="[
@@ -241,6 +242,21 @@
                   :tabs="nextUserTabs"
                 />
               </el-form-item>
+              <el-form-item
+                v-if="isHideCurrentOrg"
+                prop="nextCurrentOrgObj"
+                :label="currentOrgName ? currentOrgName : '本单位'"
+              >
+                <SelectUser
+                  :nextUser="nextNode.nextCurrentOrgObj"
+                  multiple
+                  mix
+                  :selectUserList="selectNextCurrentOrgObjList"
+                  @change="changeSelectUser($event, 'nextCurrentOrgObj', true)"
+                  :types="['department', 'employee']"
+                  :params="{ filid: userModel.orgId }"
+                />
+              </el-form-item>
               <TimeLimit
                 v-if="nodeType !== 0 && isLimitedTimeHandling === 1"
                 :newsList="newsList"
@@ -363,7 +379,7 @@
     </div>
     <div
       class="es-flow-buttons"
-      v-if="typeCode != 'fenyue' && !shrink"
+      v-if="newTypeCode != 'fenyue' && !shrink"
       style="margin-top: 10px"
     >
       <div v-if="isSubmitButtonShowAgreeAndDisagree == 1">
@@ -582,6 +598,7 @@ import {
   taskHandleHtml
 } from 'eoss-ui/src/config/api';
 import util from 'eoss-ui/src/utils/util';
+import qs from 'qs';
 export default {
   name: 'EsFlow',
   componentName: 'EsFlow',
@@ -627,6 +644,7 @@ export default {
     return {
       userModel: {},
       loading: null, // 加载中
+      newTypeCode: '',
       NodeName: '', // 当前节点值
       radioList: [],
       value: '',
@@ -637,6 +655,7 @@ export default {
       activeNames: '',
       isEndUserTask: true,
       selectUserList: [],
+      selectNextCurrentOrgObjList: [],
       flowMultiple: true,
       isCustomUser: 0,
       shrink: false,
@@ -671,6 +690,11 @@ export default {
       isTaskread: 0, //是否展示分阅用户
       showSendMsg: false, //是否展示核稿通知页面
       canPresetRead: false, //是否展示自动分阅
+      isHideCurrentOrg: false, //是否隐藏本单位(承办)
+      isHideOtherOrg: false, //是否隐藏外单位(承办)
+      isMainSubProcess: false, // 判断是否子-主流程
+      isNextUser: false,
+      isShowNode: false,
       nextNodeList: [],
       removeUsers: [],
       options: [],
@@ -767,9 +791,11 @@ export default {
   mounted() {
     this.businessIds = this.businessId;
     this.nextNode.nextNodeId = this.nextNodeId;
+    !this.isFlow &&
+      (this.newTypeCode = this.typeCode || this.$route.query.typecode);
     if (this.isFlow) {
       this.businessId && this.getProcess();
-    } else if (this.typeCode == 'fenyue') {
+    } else if (this.newTypeCode == 'fenyue') {
       this.getTaskReadFlow();
     } else {
       this.getHedInfo();
@@ -936,15 +962,21 @@ export default {
             appId,
             processDefinitionId,
             pendingId,
-            opinion: this.value
+            opinion: this.value,
+            taskAction: 'complete'
           };
           util
             .ajax({
               url: taskReadHtml,
               params: { taskAction: 'complete' },
-              headers: { Accept: 'application/json,text/plain' },
+              headers: {
+                Accept: 'application/json,text/plain',
+                'Content-Type':
+                  ' application/x-www-form-urlencoded; charset=UTF-8'
+              },
               method: 'post',
-              data: params
+              format:false,
+              data: qs.stringify(params)
             })
             .then((res) => {
               const { status, message } = res;
@@ -1488,6 +1520,25 @@ export default {
               this.isLimitedTimeHandling =
                 data.nodeExtAttr.isLimitedTimeHandling;
               this.nodeType = data.nodeExtAttr.nodeType;
+              //如果当前为承办节点/会签节点,则展示本单位外单位办理人选择
+              if (this.nodeType === 1 || this.nodeType === 2) {
+                this.isMainSubProcess === true
+                  ? (this.isMainSubProcess = true)
+                  : (this.isMainSubProcess = false);
+                this.isNextUser = false;
+                this.isHideCurrentOrg =
+                  res.data.nodeExtAttr.isHideCurrentOrg == 1 ? false : true; //判断是否隐藏本单位
+                this.isHideOtherOrg =
+                  res.data.nodeExtAttr.isHideOtherOrg == 1 ? false : true; //判断是否隐藏外单位
+              } else {
+                this.isHideCurrentOrg = false;
+                this.isHideOtherOrg = false;
+                this.isMainSubProcess = false;
+                this.isNextUser = true;
+                // this.isMainSubProcess === true
+                //   ? (this.isMainSubProcess = true)
+                //   : (this.isMainSubProcess = false);
+              }
               this.multiple
                 ? (this.nextNode.nextUserId = [])
                 : (this.nextNode.nextUserId = '');
@@ -1572,6 +1623,8 @@ export default {
       this.radioList = [];
 
       if (type) {
+        this.isNextUser = false;
+        this.isShowNode = false;
         this.nextNode.nextNodeId = '';
         this.nextNode.isReturnSubmitter = 0;
         this.nextNode.isUndertakeReply = 0;
@@ -1583,28 +1636,6 @@ export default {
         this.nextNode.isReturnRejectNode = 0;
         this.nextNode.isSerialSubmit = 0;
         this.nodeInfos = [];
-        if (val == -1) {
-          this.nextNode.isSerialSubmit = 1;
-        } else if (val == 0) {
-        } else if (val == 1) {
-        } else if (val == 2) {
-          this.nextNode.isReturnSubmitter = 1;
-        } else if (val == 3) {
-          this.nextNode.isUndertakeReply = 1;
-        } else if (val == 4) {
-          this.nextNode.isTakeAdviceReply = 1;
-        } else if (val == 5) {
-          this.nextNode.isUndertakeEnd = 1;
-        } else if (val == 6) {
-          this.nextNode.isTakeAdviceEnd = 1;
-        } else if (val == 7) {
-          this.nextNode.isReadDealReply = 1;
-        } else if (val == 8) {
-          this.nextNode.isReadDealEnd = 1;
-        } else if (val == 9) {
-          this.nextNode.isReturnRejectNode = 1;
-        } else {
-        }
         this.operationList.map((item) => {
           if (item.key === val) {
             if (!item.taskNodeList) {
@@ -1630,10 +1661,52 @@ export default {
 
       if (val === 9) {
         this.isReject = true;
+      } else {
+        this.isReject = false;
+      }
+      if (val == -1) {
+        this.nextNode.isSerialSubmit = 1;
+        this.loading.close();
+        return;
+      } else if (val == 0) {
+        this.isNextUser = true;
+        this.isShowNode = true;
+      } else if (val == 1) {
+        this.isNextUser = true;
+        this.isShowNode = true;
+      } else if (val == 2) {
+        this.nextNode.isReturnSubmitter = 1;
+        this.loading.close();
+        return;
+      } else if (val == 3) {
+        this.nextNode.isUndertakeReply = 1;
+        this.loading.close();
+        return;
+      } else if (val == 4) {
+        this.nextNode.isTakeAdviceReply = 1;
+        this.loading.close();
+        return;
+      } else if (val == 5) {
+        this.nextNode.isUndertakeEnd = 1;
+        this.loading.close();
+        return;
+      } else if (val == 6) {
+        this.nextNode.isTakeAdviceEnd = 1;
+        this.loading.close();
+        return;
+      } else if (val == 7) {
+        this.nextNode.isReadDealReply = 1;
+        this.loading.close();
+        return;
+      } else if (val == 8) {
+        this.nextNode.isReadDealEnd = 1;
+        this.loading.close();
+        return;
+      } else if (val == 9) {
+        this.nextNode.isReturnRejectNode = 1;
         this.loading.close();
         return;
       } else {
-        this.isReject = false;
       }
       if (isDef !== true) this.getNodeInfo();
     },
@@ -1886,6 +1959,7 @@ export default {
                 }
               });
             }
+            this.isMainSubProcess = res.data.isMainSubProcess === true;
             this.isCustomPreset = isCustomPreset;
             this.isPreset = isPreset;
             this.presetTaskNodeMap = presetTaskNodeMap;
@@ -2069,7 +2143,7 @@ export default {
           if (this.isFlow) return (this.handleVisible = true);
           if (
             !this.endFlow &&
-            this.typeCode != 'fenyue' &&
+            this.newTypeCode != 'fenyue' &&
             !this.shrink &&
             this.nextNode.isAddSign != '1' &&
             this.nextNode.isRemoveSign != '1' &&
@@ -2143,8 +2217,8 @@ export default {
               this.processObj.taskExamine.processDefinitionId;
           }
           if (
-            this.nextNode.nextOperate == 9 ||
-            this.nextNode.nextOperate == 2
+            this.nextNode.nextOperate != 0 &&
+            this.nextNode.nextOperate != 1
           ) {
             delete this.nextNode.nextNodeId;
           }

package/packages/flow/src/startTaskRead.vue

@@ -152,6 +152,7 @@ import {
 } from 'eoss-ui/src/config/api';
 import util from 'eoss-ui/src/utils/util';
 import SelectUser from './selectUser.vue';
+import qs from 'qs';
 export default {
   name: 'StartTaskRead',
   components: {
@@ -398,13 +399,15 @@ export default {
     },
     // 转办提交
     subTaskTransfer() {
-      const { choiceDeptId, choiceOrgId } = this.taskExamine;
+      const { choiceDeptId, choiceOrgId, bCode, bName } = this.taskExamine;
       const { opinion, pendingId, nextNode, newsInfo, multiple } = this;
       let params = {
         url: taskTransfer,
         data: {
           choiceDeptId,
           choiceOrgId,
+          bCode,
+          bName,
           nextUserId: multiple
             ? nextNode.nextUser.join(',')
             : nextNode.nextUser,
@@ -456,6 +459,8 @@ export default {
             const {
               appId,
               businessId,
+              bCode,
+              bName,
               choiceDeptId,
               choiceOrgId,
               businessName,
@@ -463,6 +468,8 @@ export default {
             } = this.taskExamine;
             let params = {
               ...this.nextNode,
+              bCode,
+              bName,
               appId,
               businessId,
               choiceDeptId,
@@ -489,9 +496,14 @@ export default {
               .ajax({
                 url: taskReadHtml,
                 params: { taskAction: this.type },
-                headers: { Accept: 'application/json,text/plain' },
+                headers: {
+                  Accept: 'application/json,text/plain',
+                  'Content-Type':
+                    ' application/x-www-form-urlencoded; charset=UTF-8'
+                },
                 method: 'post',
-                data: params
+                format: false,
+                data: qs.stringify(params)
               })
               .then((res) => {
                 const { message, status } = res;

package/packages/form/src/table.vue

@@ -129,7 +129,7 @@
                 :class="
                   item.type === 'label' || item.type === 'empty'
                     ? 'es-table-form-label'
-                    : 'es-table-form-item'
+                    : item.disabled?'es-table-form-item td-disabled':'es-table-form-item'
                 "
                 :key="index"
                 :colspan="
@@ -986,6 +986,7 @@ export default {
         render: [Function, String]
       },
       render: (h, ctx) => {
+        console.log('ctx', ctx);
         if (typeof ctx.props.render == 'string') {
           try {
             return util.toFunction(ctx.props.render)(h, params);