eoss-ui 0.4.17 → 0.4.19

package/packages/flow/src/main.vue

@@ -33,7 +33,7 @@
         class="es-common-opinions"
         v-show="!shrink"
         ref="commonOpinions"
-        @change="val => (value = val)"
+        @change="(val) => (value = val)"
         :opinion="value"
         :isBanInputOpinion="isBanInputOpinion"
       />
@@ -147,8 +147,8 @@
           <div
             v-if="
               nextNode.isAddSign != '1' &&
-                nextNode.isRemoveSign != '1' &&
-                isSpecial
+              nextNode.isRemoveSign != '1' &&
+              isSpecial
             "
           >
             <el-form-item
@@ -234,7 +234,7 @@
               <TimeLimit
                 v-if="nodeType !== 0 && isLimitedTimeHandling === 1"
                 :newsList="newsList"
-                @change="val => (nextNode = { ...nextNode, ...val })"
+                @change="(val) => (nextNode = { ...nextNode, ...val })"
               />
               <el-form-item
                 prop="nextReadUserId"
@@ -291,11 +291,11 @@
           v-if="isCustomPreset"
           ref="customPreset"
           @changeCustom="
-            data => {
+            (data) => {
               presetList = data;
             }
           "
-          @changeActiveNames="val => (activeNames = val)"
+          @changeActiveNames="(val) => (activeNames = val)"
           @loadingEnd="customLoading('end')"
           @loadingStart="customLoading('start')"
           :nextNode="nextNode.nextNodeId"
@@ -305,7 +305,7 @@
         <Preset
           v-if="isPreset"
           @changePreset="
-            data => {
+            (data) => {
               presetUserJson = data;
             }
           "
@@ -336,10 +336,12 @@
           <div
             v-show="showNews"
             style="
-             { border: 1px solid #ccc;
-              padding: 5px;
-              border-radius: 5px;
-              font-size: 13px;}
+               {
+                border: 1px solid #ccc;
+                padding: 5px;
+                border-radius: 5px;
+                font-size: 13px;
+              }
             "
           >
             {{ nextNode.notificationMsg }}
@@ -373,7 +375,7 @@
           :key="item.name"
           :type="item.type"
           :style="btnStyle"
-          @click="item.event === 'sub' ? subProcess() : saveInfo()"
+          @click="item.event === 'sub' ? subProcess() : saveInfo(false, item)"
         >
           {{ item.text }}
         </el-button>
@@ -446,11 +448,7 @@
       <!-- <FlowChart :nodeId="nodeInfo.nextNode" v-if="showFlowChart" /> -->
       <img
         style="width: 100%"
-        :src="
-          `${charUrl}/bpm/service/diagram/getpng.png?processDefinitionId=${
-            nodeInfo.nextNode
-          }`
-        "
+        :src="`${charUrl}/bpm/service/diagram/getpng.png?processDefinitionId=${nodeInfo.nextNode}`"
         alt="加载失败"
       />
     </es-dialog>
@@ -497,7 +495,7 @@
       <FileList
         :ownId="pendingId"
         :code="attachedCode"
-        @changeFileNum="val => (fileNum = val)"
+        @changeFileNum="(val) => (fileNum = val)"
       />
     </es-dialog>
     <es-dialog
@@ -597,7 +595,7 @@ export default {
     },
     subFun: {
       type: Function,
-      default: callBack => {
+      default: (callBack) => {
         callBack();
       }
     },
@@ -837,7 +835,7 @@ export default {
       };
       util
         .ajax(params)
-        .then(res => {
+        .then((res) => {
           const { rCode, results, msg } = res;
           if (rCode == 0) {
             results && (this.fileNum = results.length);
@@ -845,7 +843,7 @@ export default {
             this.$message.error(msg || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -906,12 +904,8 @@ export default {
       })
         .then(() => {
           this.loading = util.loading(this.$loading, '加载中...');
-          const {
-            businessId,
-            appId,
-            processDefinitionId,
-            pendingId
-          } = this.taskExamineInfo;
+          const { businessId, appId, processDefinitionId, pendingId } =
+            this.taskExamineInfo;
           let params = {
             businessId,
             appId,
@@ -927,7 +921,7 @@ export default {
               method: 'post',
               data: params
             })
-            .then(res => {
+            .then((res) => {
               const { status, message } = res;
               this.loading.close();
               if (status === 'success') {
@@ -938,7 +932,7 @@ export default {
                 this.$emit('error');
               }
             })
-            .catch(err => {
+            .catch((err) => {
               this.loading.close();
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);
@@ -954,7 +948,7 @@ export default {
           url: toStartTaskReadIndex,
           params: { pendingId: this.pendingId }
         })
-        .then(res => {
+        .then((res) => {
           const {
             status,
             message,
@@ -972,7 +966,7 @@ export default {
           }
           this.loading.close();
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading.close();
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -986,7 +980,7 @@ export default {
       } else {
         util
           .ajax({ url: loginUserInfo })
-          .then(res => {
+          .then((res) => {
             const { status, data } = res;
             if (status == 'success') {
               this.userModel = data;
@@ -995,7 +989,7 @@ export default {
               this.$message.error(msg);
             }
           })
-          .catch(err => {
+          .catch((err) => {
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
             }
@@ -1020,13 +1014,13 @@ export default {
           url: findCodeValues,
           params: { ccCode: 'notification_type' }
         })
-        .then(res => {
+        .then((res) => {
           const { status, data } = res;
           if (status === 'success') {
             this.newsList = data;
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -1038,28 +1032,50 @@ export default {
      * @author liufan
      * @date 2022年9月9日
      **/
-    saveInfo(type) {
+    saveInfo(type, btn) {
       if (this.isFlow) {
         if (!type) {
-          if (this.beforeSubmit != undefined) {
-            this.beforeSubmit(0)
-              .then(next => {
+          if (btn.before) {
+            btn
+              .before(
+                Object.prototype.hasOwnProperty.call(btn, 'code') ? btn.code : 1
+              )
+              .then((next) => {
+                this.$emit('save', this.businessIds);
+              })
+              .catch((e) => {});
+          } else if (this.beforeSubmit != undefined) {
+            this.beforeSubmit(
+              Object.prototype.hasOwnProperty.call(btn, 'code') ? btn.code : 1
+            )
+              .then((next) => {
                 this.$emit('save', this.businessIds);
               })
-              .catch(e => {});
+              .catch((e) => {});
           } else {
             this.$emit('save', this.businessIds);
           }
         }
       } else {
-        if (this.beforeSubmit == undefined && !type) {
+        if (btn.before && !type) {
+          btn
+            .before(
+              Object.prototype.hasOwnProperty.call(btn, 'code') ? btn.code : 2
+            )
+            .then((next) => {
+              this.saveFlowInfo();
+            })
+            .catch((e) => {});
+        } else if (this.beforeSubmit == undefined && !type) {
           this.subFun(this.saveFlowInfo);
         } else if (!type && this.beforeSubmit != undefined) {
-          this.beforeSubmit(2)
-            .then(next => {
+          this.beforeSubmit(
+            Object.prototype.hasOwnProperty.call(btn, 'code') ? btn.code : 2
+          )
+            .then((next) => {
               this.saveFlowInfo();
             })
-            .catch(e => {});
+            .catch((e) => {});
         } else {
           this.saveFlowInfo(type);
         }
@@ -1073,7 +1089,7 @@ export default {
       this.loading = util.loading(this.$loading, '保存中...');
       util
         .ajax({ url: tempSave, params })
-        .then(res => {
+        .then((res) => {
           const { status, message } = res;
           this.loading.close();
           if (status == 'success') {
@@ -1083,7 +1099,7 @@ export default {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading.close();
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -1126,13 +1142,13 @@ export default {
         .ajax({
           url: findSysCodes
         })
-        .then(res => {
+        .then((res) => {
           const { status, message } = res;
           if (status === 'success') {
             this.nextNode.notificationType = message.split(',');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -1170,7 +1186,7 @@ export default {
           this.loading = util.loading(this.$loading, '加载中...');
           util
             .ajax(params)
-            .then(res => {
+            .then((res) => {
               const { status, message } = res;
               this.loading.close();
               if (status === 'success') {
@@ -1181,14 +1197,14 @@ export default {
                 this.$emit('error');
               }
             })
-            .catch(err => {
+            .catch((err) => {
               this.loading.close();
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);
               }
             });
         })
-        .catch(e => {});
+        .catch((e) => {});
     },
     /**
      * goView
@@ -1289,7 +1305,7 @@ export default {
       this.loading = util.loading(this.$loading, '加载中...');
       util
         .ajax(params)
-        .then(res => {
+        .then((res) => {
           const { message } = res;
           this.loading.close();
           if (message == 'success') {
@@ -1298,7 +1314,7 @@ export default {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading.close();
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -1359,7 +1375,7 @@ export default {
           this.loading = util.loading(this.$loading, '加载中...');
           util
             .ajax(params)
-            .then(res => {
+            .then((res) => {
               const { status, message } = res;
               this.loading.close();
               if (status === 'success') {
@@ -1370,7 +1386,7 @@ export default {
                 this.$emit('error');
               }
             })
-            .catch(err => {
+            .catch((err) => {
               this.loading.close();
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);
@@ -1410,7 +1426,7 @@ export default {
       };
       util
         .ajax({ url: getNodeInfo, params })
-        .then(res => {
+        .then((res) => {
           const { status, message, data } = res;
           this.loading.close();
           if (status === 'success') {
@@ -1450,7 +1466,7 @@ export default {
                 data.nodeExtAttr.isDefSelectedObj == 1 &&
                 data.nextUserList !== undefined
               ) {
-                data.nextUserList.map(item => {
+                data.nextUserList.map((item) => {
                   this.nextNode.nextUserId.push(item.userId);
                   this.selectUserList.push({
                     showname: item.username,
@@ -1458,7 +1474,7 @@ export default {
                   });
                 });
               }
-              data.nextUserList.map(item => {
+              data.nextUserList.map((item) => {
                 this.options.push({
                   showname: item.username,
                   showid: item.userId
@@ -1496,7 +1512,7 @@ export default {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading.close();
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -1523,7 +1539,7 @@ export default {
 
       if (type) {
         this.nodeInfos = [];
-        this.operationList.map(item => {
+        this.operationList.map((item) => {
           if (item.key === val) {
             if (!item.taskNodeList) {
               this.nodeInfos = [];
@@ -1534,7 +1550,7 @@ export default {
         });
         if (this.defaultNextNode) {
           let defaultNode = this.nodeInfos.filter(
-            item => item.nodeId == this.defaultNextNode
+            (item) => item.nodeId == this.defaultNextNode
           );
           if (this.nodeInfos.length > 0 && defaultNode.length == 0) {
             this.nextNode.nextNodeId = this.nodeInfos[0].nodeId;
@@ -1610,7 +1626,7 @@ export default {
       };
       util
         .ajax({ url: getHandleInfoHtml, params })
-        .then(res => {
+        .then((res) => {
           //pc返回数据
           const {
             status,
@@ -1650,12 +1666,10 @@ export default {
             this.canPresetRead = canPresetRead;
             this.isCdjxjTaskHandle = isCdjxjTaskHandle;
             if (canPresetRead) {
-              let ids = nodeInfoMap.nodeExtAttr.presetReadCandinateIds.split(
-                ','
-              );
-              let names = nodeInfoMap.nodeExtAttr.presetReadCandinateNames.split(
-                ','
-              );
+              let ids =
+                nodeInfoMap.nodeExtAttr.presetReadCandinateIds.split(',');
+              let names =
+                nodeInfoMap.nodeExtAttr.presetReadCandinateNames.split(',');
               ids.map((item, index) => {
                 this.presetReadUserId.push({
                   showid: item,
@@ -1675,7 +1689,7 @@ export default {
             if (canRemoveSignUserList && canRemoveSignUserList.length != 0)
               this.removeUsers = canRemoveSignUserList;
             if (taskOperations && taskOperations.length != 0) {
-              taskOperations.map(item => {
+              taskOperations.map((item) => {
                 if (item.key === 9) this.isReject = true;
                 if (item.isSelected) {
                   this.nodeInfos = [];
@@ -1705,7 +1719,8 @@ export default {
               this.defaultNextNode = nodeInfoMap.nodeExtAttr.defaultNextNode;
               if (nodeInfoMap.nodeExtAttr.defaultNextNode) {
                 let defaultNode = this.nodeInfos.filter(
-                  item => item.nodeId == nodeInfoMap.nodeExtAttr.defaultNextNode
+                  (item) =>
+                    item.nodeId == nodeInfoMap.nodeExtAttr.defaultNextNode
                 );
                 if (this.nodeInfos.length > 0 && defaultNode.length == 0) {
                   this.nextNode.nextNodeId = this.nodeInfos[0].nodeId;
@@ -1776,7 +1791,7 @@ export default {
             this.nextNode.notificationMsg = defaultNotificationMessage;
             this.moreList = [];
             if (taskButtonList && taskButtonList.length != 0) {
-              taskButtonList.map(item => {
+              taskButtonList.map((item) => {
                 if (item.fun === 'reject()') {
                   this.rejectObj = item;
                 } else if (item.fun === 'toStartTaskRead()') {
@@ -1802,7 +1817,7 @@ export default {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading.close();
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -1867,13 +1882,13 @@ export default {
       this.loading = util.loading(this.$loading, '加载中...');
       util
         .ajax({ url: getProcessDefList, params })
-        .then(res => {
+        .then((res) => {
           const { status, message, data } = res;
           this.loading.close();
           if (status === 'success') {
             this.nodeInfo.option = data.definitionList;
             this.nodeInfo.nextNode = data.definitionList.filter(
-              item => item.processDefKey == this.defaultProcessKey
+              (item) => item.processDefKey == this.defaultProcessKey
             );
             if (this.nodeInfo.nextNode.length) {
               this.nodeInfo.nextNode = this.nodeInfo.nextNode[0].processDefId;
@@ -1888,7 +1903,7 @@ export default {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading.close();
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -1909,7 +1924,7 @@ export default {
       };
       util
         .ajax({ url: pendedhistoryList, data: params, method: 'post' })
-        .then(res => {
+        .then((res) => {
           const { rCode, msg, results } = res;
           if (!rCode) {
             this.nextNode.nextUserId = [];
@@ -1921,7 +1936,7 @@ export default {
             this.$message.error(msg || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -1936,7 +1951,7 @@ export default {
      * @date 2022年5月25日
      **/
     subProcess(val) {
-      this.$refs['nextNode'].validate(valid => {
+      this.$refs['nextNode'].validate((valid) => {
         if (valid) {
           if (this.isSubmitButtonShowAgreeAndDisagree == 1) {
             this.value = this.value.replace(RegExp('不同意。', 'g'), '');
@@ -1947,16 +1962,16 @@ export default {
             this.subFun(this.sendData);
           } else {
             this.beforeSubmit(1)
-              .then(next => {
+              .then((next) => {
                 this.sendData();
               })
-              .catch(e => {});
+              .catch((e) => {});
           }
         }
       });
     },
     sendData() {
-      this.$refs['nextNode'].validate(async valid => {
+      this.$refs['nextNode'].validate(async (valid) => {
         if (valid) {
           await this.saveInfo('subMit');
           if (this.isFlow) return (this.handleVisible = true);
@@ -1990,7 +2005,7 @@ export default {
           let nextUserId = [];
           if (this.multiple) {
             this.nextNode.nextUserId &&
-              this.nextNode.nextUserId.map(item => nextUserId.push(item));
+              this.nextNode.nextUserId.map((item) => nextUserId.push(item));
           }
           if (
             this.nextNode.isAddSign == '1' &&
@@ -2004,13 +2019,13 @@ export default {
             return this.$message.warning('请选择减签办理人');
           let addSignUserId = [];
           if (this.isCanAddSign && this.nextNode.isAddSign == '1') {
-            this.nextNode.addSignUserId.map(item => {
+            this.nextNode.addSignUserId.map((item) => {
               addSignUserId.push(item);
             });
           }
           let removeSignUserId = [];
           if (this.isCanRemoveSign && this.nextNode.isRemoveSign == '1') {
-            this.nextNode.removeSignUserId.map(item => {
+            this.nextNode.removeSignUserId.map((item) => {
               removeSignUserId.push(item);
             });
           }
@@ -2032,7 +2047,8 @@ export default {
           }
           if (this.nextNode.nextOperate === 9) {
             this.nextNode.isReturnRejectNode = 1;
-            this.nextNode.processDefinitionId = this.processObj.taskExamine.processDefinitionId;
+            this.nextNode.processDefinitionId =
+              this.processObj.taskExamine.processDefinitionId;
           }
           this.loading = util.loading(this.$loading, '加载中...');
 
@@ -2079,7 +2095,7 @@ export default {
           this.loading = util.loading(this.$loading, '提交中...');
           util
             .ajax({ url: taskHandleHtml, method: 'post', data: params })
-            .then(res => {
+            .then((res) => {
               const { status, message } = res;
               this.loading.close();
               if (status === 'success') {
@@ -2090,7 +2106,7 @@ export default {
                 this.$emit('error');
               }
             })
-            .catch(err => {
+            .catch((err) => {
               this.loading.close();
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);

package/packages/flow/src/selectUser.vue

@@ -42,7 +42,7 @@
       </el-option>
     </el-select> -->
     <!-- class="select-user-icon el-button--primary" -->
-    <div style="position:relative">
+    <div style="position: relative">
       <!-- <es-selector
         v-if="isChange"
         v-model="newSelectUserList"
@@ -72,6 +72,7 @@
         @cancel="cancelSelectUser"
         @change="getSelectUser"
         :param="newParams"
+        ><i class="es-icon-user"></i
       ></es-selector>
       <!-- :action="url" -->
       <!-- :where="{type:'user',a:'1'}" -->
@@ -262,14 +263,14 @@ export default {
             url: handleInfo,
             params: { searchKey: query, query, type: 'user' }
           })
-          .then(res => {
+          .then((res) => {
             const { status, data } = res;
             this.searchLoading = false;
             if (status === 'success') {
               this.newOptions = data;
             }
           })
-          .catch(err => {
+          .catch((err) => {
             this.searchLoading = false;
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
@@ -282,8 +283,8 @@ export default {
     changeSelectUser(val) {
       this.newSelectUserList = [];
       if (this.newMultiple) {
-        val.map(item => {
-          this.newOptions.map(items => {
+        val.map((item) => {
+          this.newOptions.map((items) => {
             if (item === items.id) {
               this.newSelectUserList.push({
                 showname: items.name,
@@ -293,7 +294,7 @@ export default {
           });
         });
       } else {
-        this.newOptions.map(item => {
+        this.newOptions.map((item) => {
           if (item.id === val) {
             this.newSelectUserList.push({
               showname: item.name,
@@ -329,7 +330,7 @@ export default {
       if (this.newMultiple) {
         this.newNextUser = [];
 
-        this.newSelectUserList.map(item => {
+        this.newSelectUserList.map((item) => {
           if (this.mix) {
             this.newOptions.push({
               ...item,
@@ -371,7 +372,7 @@ export default {
       let data = {};
       if (this.mix) data = this.getMixList();
       if (this.newMultiple) {
-        this.newNextUser.map(item => {
+        this.newNextUser.map((item) => {
           //  if (this.mix) {
           //   this.newOptions.push({
           //     id: item.showid,
@@ -381,8 +382,8 @@ export default {
           // } else {
           //   this.newOptions.push({...item, id: item.showid, name: item.showname });
           // }
-          this.newOptions.map(items => {
-            oldUserList.map(val => {
+          this.newOptions.map((items) => {
+            oldUserList.map((val) => {
               if (items.showid != val.showid && val.showid == item) {
                 this.newSelectUserList.push({
                   ...val
@@ -397,7 +398,7 @@ export default {
           });
         });
         var obj = {};
-        this.newSelectUserList = this.newSelectUserList.reduce(function(
+        this.newSelectUserList = this.newSelectUserList.reduce(function (
           item,
           next
         ) {
@@ -406,7 +407,7 @@ export default {
         },
         []);
       } else {
-        this.newOptions.map(item => {
+        this.newOptions.map((item) => {
           if (item.showid === this.newNextUser) {
             this.newSelectUserList.push({
               ...item