eoss-ui 0.4.20 → 0.4.22

package/lib/wxlogin.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 61);
+/******/ 	return __webpack_require__(__webpack_require__.s = 62);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2259,7 +2259,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "n", function() { return doWechatQrLogin; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "V", function() { return mainConfig; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "R", function() { return initUserSet; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Nb", function() { return updateUserInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Mb", function() { return updateUserInfo; });
 /* unused harmony export getUserImgUrl */
 /* unused harmony export getDoorIndex */
 /* unused harmony export refreshOnlineUsers */
@@ -2268,17 +2268,17 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "x", function() { return getComplexApplications; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "y", function() { return getComplexApplicationsNew; });
 /* unused harmony export getUserCustomInfo */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Mb", function() { return updateUserCustomInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Lb", function() { return updateUserCustomInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lb", function() { return sysMsgPage; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "O", function() { return ignoreSysMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "N", function() { return ignoreAllSysMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "w", function() { return getAdjunctProperties; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Rb", function() { return uploads; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Pb", function() { return uploadOnlyOne; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Qb", function() { return uploads; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ob", function() { return uploadOnlyOne; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "v", function() { return getAdjunctFileInfos; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Qb", function() { return uploadSort; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Pb", function() { return uploadSort; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "o", function() { return downloadByAdjunctId; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ob", function() { return uploadDownloads; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Nb", function() { return uploadDownloads; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return previewAdjunct; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bb", function() { return previewAdjunct2; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cb", function() { return previewAdjunctOffice; });
@@ -2295,13 +2295,13 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return gethelpdoc; });
 /* unused harmony export getCurrentuser */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "W", function() { return mainDetail; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yb", function() { return toStartFlow; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "vb", function() { return tempSave; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "xb", function() { return toStartFlow; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ub", 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__, "fb", function() { return saveCommonOpinion; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Lb", function() { return updateCommonOpinion; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kb", function() { return updateCommonOpinion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "g", function() { return deleteCommonOpion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "H", function() { return getProcessDefList; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "C", function() { return getNodeInfo; });
@@ -2309,46 +2309,46 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return findSysCodes; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "D", function() { return getNotificationMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "z", function() { return getHandleInfoHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mb", function() { return taskHandleHtml; });
+/* unused harmony export taskHandleHtml */
 /* unused harmony export getView */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return register; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "X", function() { return pendedhistoryList; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Bb", function() { return toTaskRejectHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ob", function() { return taskRejectHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zb", function() { return toStartTaskRead; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ab", function() { return toStartTaskReadIndex; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "nb", function() { return taskReadHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ab", function() { return toTaskRejectHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "nb", function() { return taskRejectHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yb", function() { return toStartTaskRead; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zb", function() { return toStartTaskReadIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mb", function() { return taskReadHtml; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "eb", function() { return rejectAndEnd; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "xb", function() { return toSendMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "wb", function() { return toSendMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "jb", function() { return sendMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "q", function() { return endFlowHtml; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "M", function() { return handleInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "T", function() { return loginUserInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Sb", function() { return wss; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Jb", function() { return topic; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Rb", function() { return wss; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ib", function() { return topic; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "F", function() { return getPresetCustomInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "G", function() { return getPresetNodeInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Fb", function() { return toTaskTransferIndex; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sb", function() { return taskTransfer; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "wb", function() { return toPresetInfoListIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Eb", function() { return toTaskTransferIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rb", function() { return taskTransfer; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "vb", 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__, "Y", function() { return pendedhistoryListJson; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Z", function() { return pressListJson; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "h", function() { return deleteFlow; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "S", function() { return isCanStartSubFlow; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Gb", function() { return toTaskUnionExamine; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tb", function() { return taskUnionExamine; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Eb", function() { return toTaskTakeAdvice; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rb", function() { return taskTakeAdvice; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Db", function() { return toTaskStartDraft; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "qb", function() { return taskStartDraft; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Cb", function() { return toTaskReview; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return taskReview; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Hb", function() { return toTaskUnionSeal; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ub", function() { return taskUnionSeal; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ib", function() { return toTwoOfficesDispatch; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kb", function() { return twoOfficesDispatch; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Fb", function() { return toTaskUnionExamine; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sb", function() { return taskUnionExamine; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Db", function() { return toTaskTakeAdvice; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "qb", function() { return taskTakeAdvice; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Cb", function() { return toTaskStartDraft; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return taskStartDraft; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Bb", function() { return toTaskReview; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ob", function() { return taskReview; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Gb", function() { return toTaskUnionSeal; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tb", function() { return taskUnionSeal; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Hb", function() { return toTwoOfficesDispatch; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Jb", function() { return twoOfficesDispatch; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ib", function() { return sendList; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hb", function() { return sendInfo; });
 /* unused harmony export sendSave */
@@ -2547,7 +2547,7 @@ var taskUnionSeal = '/bpm/task/taskHandle/taskUnionSeal.dhtml';
 // 报送两办
 var toTwoOfficesDispatch = '/bpm/bpmBackend/toTwoOfficesDispatch';
 // 报送两办提交
-var twoOfficesDispatch = 'task/taskHandle/twoOfficesDispatch.dhtml';
+var twoOfficesDispatch = '/bpm/task/taskHandle/twoOfficesDispatch.dhtml';
 
 // notifySend 消息发送
 var sendList = '/notify2/notifySendRecord/listJson';
@@ -2696,7 +2696,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 61:
+/***/ 62:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/package.json

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

package/packages/button/src/main.vue

@@ -57,14 +57,14 @@ export default {
           let flag = true;
           if (this.required) {
             if (Array.isArray(this.required)) {
-              this.esForm.validateField(this.required, res => {
+              this.esForm.validateField(this.required, (res) => {
                 if (res) {
                   flag = false;
                 }
               });
               if (flag) {
                 fields = this.required;
-                this.required.forEach(item => {
+                this.required.forEach((item) => {
                   param[item] = models[item];
                 });
               }
@@ -73,13 +73,13 @@ export default {
                 fields.push(this.required[i]);
                 param[i] = models[this.required[i]];
               }
-              this.esForm.validateField(fields, res => {
+              this.esForm.validateField(fields, (res) => {
                 if (res) {
                   flag = false;
                 }
               });
             } else {
-              this.esForm.validateField(this.required, res => {
+              this.esForm.validateField(this.required, (res) => {
                 if (res) {
                   flag = false;
                 }
@@ -99,7 +99,7 @@ export default {
           if (this.fields) {
             let empty = [];
             if (Array.isArray(this.fields)) {
-              this.fields.forEach(item => {
+              this.fields.forEach((item) => {
                 if (models[item] == undefined || models[item] == '') {
                   empty.push(item);
                 }
@@ -127,7 +127,7 @@ export default {
             if (empty.length) {
               let msg = [];
               if (this.mapFields) {
-                empty.forEach(item => {
+                empty.forEach((item) => {
                   msg.push(this.mapFields[item]);
                 });
               } else {
@@ -210,7 +210,7 @@ export default {
             let times = setInterval(() => {
               if (windows.closed) {
                 clearInterval(times);
-                this.esSelect && this.esSelect.reload(param);
+                this.esSelect && this.esSelect.reload(null, param, true);
                 this.esTable && this.esTable.reload(param);
               }
             }, 1000);

package/packages/data-table/src/main.vue

@@ -402,7 +402,8 @@ export default {
     immediate: {
       type: Boolean,
       default: true
-    }
+    },
+    zoom: false
   },
   data() {
     return {
@@ -505,6 +506,13 @@ export default {
     }
   },
   watch: {
+    zoom: {
+      handler(val) {
+        if (this.tableHeight != 'auto' && this.display) {
+          this.resetHeight();
+        }
+      }
+    },
     checked(newVal) {
       this.checkSelect(newVal);
     },

package/packages/flow/src/component/taskUnionExamine.vue

@@ -196,7 +196,7 @@ export default {
       let params = {
         url: taskReview,
         data: {
-          nextUserId: nextOtherOrgObj,
+          nextUserId: nextOtherOrgObj.join(','),
           notificationType: noticeType.join(','),
           notificationMsg: noticeInfo,
           opinion,
@@ -393,8 +393,8 @@ export default {
         data: {
           opinion,
           pendingId,
-          nextOtherOrgObj: nextOtherOrgObj,
-          nextCurrentOrgObj: nextCurrentOrgObj,
+          nextOtherOrgObj: nextOtherOrgObj.join(','),
+          nextCurrentOrgObj: nextCurrentOrgObj.join(','),
           notificationMsg: noticeInfo,
           notificationType: noticeType.join(','),
           choiceDeptId,

package/packages/flow/src/main.vue

@@ -612,6 +612,7 @@ export default {
       flowType: '',
       flowDisabled: false,
       activeNames: '',
+      isEndUserTask: true,
       selectUserList: [],
       flowMultiple: true,
       isCustomUser: 0,
@@ -1467,18 +1468,22 @@ export default {
                 data.nextUserList !== undefined
               ) {
                 data.nextUserList.map((item) => {
-                  this.nextNode.nextUserId.push(item.userId);
-                  this.selectUserList.push({
-                    showname: item.username,
-                    showid: item.userId
-                  });
+                  if (item.userId && item.username) {
+                    this.nextNode.nextUserId.push(item.userId);
+                    this.selectUserList.push({
+                      showname: item.username,
+                      showid: item.userId
+                    });
+                  }
                 });
               }
               data.nextUserList.map((item) => {
-                this.options.push({
-                  showname: item.username,
-                  showid: item.userId
-                });
+                if (item.userId && item.username) {
+                  this.options.push({
+                    showname: item.username,
+                    showid: item.userId
+                  });
+                }
               });
               if (data.nodeExtAttr.presetEdit != 0) {
                 this.radioList = this.options;
@@ -1632,6 +1637,7 @@ export default {
             status,
             message,
             data: {
+              isEndUserTask,
               nextNodeList,
               taskOperations,
               isCustomPreset,
@@ -1701,6 +1707,13 @@ export default {
                   //   this.nextNode.nextNodeId = item.taskNodeList[0].nodeId;
                   // }
                 }
+                if (taskOperations.length == 1) {
+                  this.nodeInfos = [];
+                  this.nextNode.nextOperate = taskOperations[0].key;
+                  if (taskOperations[0].taskNodeList != null) {
+                    this.nodeInfos = taskOperations[0].taskNodeList;
+                  }
+                }
               });
             }
             this.operationList = taskOperations;
@@ -1715,7 +1728,7 @@ export default {
                 nodeInfoMap.nodeExtAttr.nodeDefaultRejectOpinion;
               this.isOpinionRequired =
                 nodeInfoMap.nodeExtAttr.isOpinionRequired;
-              this.isChooseNextNode = nodeInfoMap.nodeExtAttr.isChooseNextNode;
+              // this.isChooseNextNode = nodeInfoMap.nodeExtAttr.isChooseNextNode;
               this.defaultNextNode = nodeInfoMap.nodeExtAttr.defaultNextNode;
               if (nodeInfoMap.nodeExtAttr.defaultNextNode) {
                 let defaultNode = this.nodeInfos.filter(
@@ -1731,10 +1744,11 @@ export default {
               } else if (this.nodeInfos.length > 0) {
                 this.nextNode.nextNodeId = this.nodeInfos[0].nodeId;
               }
-              this.choiceOrgId = choiceOrgId;
-              this.choiceDeptId = choiceDeptId;
-              this.pOrgId = pOrgId;
             }
+            this.choiceOrgId = choiceOrgId;
+            this.choiceDeptId = choiceDeptId;
+            this.pOrgId = pOrgId;
+            this.isEndUserTask = isEndUserTask;
             if (JSON.stringify(taskExamine) != '{}' && taskExamine) {
               this.nodeInfo.nextNode = taskExamine.processDefinitionId;
               this.NodeName = taskExamine.nodeName;
@@ -2092,7 +2106,27 @@ export default {
           // if(this.isSubmitButtonShowAgreeAndDisagree == 1){
           //   this.value = this.value
           // }
+          // console.log(params,'params')
+          // return
           this.loading = util.loading(this.$loading, '提交中...');
+          const {
+            isEndUserTask,
+            choiceOrgId,
+            choiceDeptId,
+            pOrgId,
+            taskExamineInfo
+          } = this;
+          params.isEndUserTask = isEndUserTask;
+          params.choiceOrgId = choiceOrgId;
+          params.choiceDeptId = choiceDeptId;
+          params.pOrgId = pOrgId;
+          params.processType = taskExamineInfo.processType;
+          params.businessId = taskExamineInfo.businessId;
+          params.appId = taskExamineInfo.appId;
+          params.processDefinitionId = taskExamineInfo.processDefinitionId;
+          params.isSubFlow = taskExamineInfo.isSubFlow;
+          params.nodeId = taskExamineInfo.nodeId;
+          return;
           util
             .ajax({ url: taskHandleHtml, method: 'post', data: params })
             .then((res) => {

package/packages/flow/src/startTaskRead.vue

@@ -474,7 +474,8 @@ export default {
               opinion: this.option, // 审批意见
               userId: util.getStorage('userId'),
               nextReadUserId: this.mixList.join('|'),
-              noticeType
+              noticeType,
+              taskAction: this.type
               // nextNodeId: this.form.nextNodeId
             };
             delete params.nextUser;
@@ -488,6 +489,7 @@ export default {
             fyeh != 'true' && delete params.isInHistory;
             !download && delete params.isDownload;
             isCdjxjTaskHandle == 'true' && delete params.noticeType;
+            console.log(params,'aaa')
             util
               .ajax({
                 url: taskReadHtml,