eoss-ui 0.6.83 → 0.6.85

package/lib/wxlogin.js

@@ -258,99 +258,7 @@ var ajax = function ajax(_ref) {
         }
       }
       if (response.status === 200) {
-        if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
-          removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump', 'showLaunch']);
-          var href = '';
-          try {
-            href = win.top.location.href;
-          } catch (error) {
-            href = win.location.href;
-          }
-          if (href.indexOf('#/login') === -1 && href.indexOf('/login.html') === -1) {
-            var remind = sessionStorage.getItem('remind');
-            if (!remind) {
-              clearTimeout(loginMsg);
-              loginMsg = setTimeout(function () {
-                sessionStorage.setItem('remind', 1);
-                eoss_element__WEBPACK_IMPORTED_MODULE_7__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
-                  confirmButtonText: '确定',
-                  closeOnClickModal: false,
-                  type: 'warning'
-                } : {
-                  confirmButtonText: '确定',
-                  cancelButtonText: '取消',
-                  closeOnClickModal: false,
-                  type: 'warning'
-                }).then(function () {
-                  try {
-                    var loginPage = getStorage('login') || getStorage('loginPage');
-                    if (loginPage) {
-                      var src = void 0;
-                      if (!startWith(loginPage, ['http', '/'], true)) {
-                        var pathname = win.top.location.pathname;
-                        if (pathname !== '/') {
-                          pathname = pathname.split('/');
-                          pathname.splice(pathname.length - 1);
-                          pathname = pathname.join('/');
-                          src = pathname + '/' + loginPage.replace('./', '');
-                        } else {
-                          src = pathname + loginPage.replace('./', '');
-                        }
-                      } else {
-                        src = loginPage;
-                      }
-                      win.top.location.href = src;
-                    } else if (win.top.location.href.indexOf('main.html') > -1) {
-                      win.top.location.href = './login.html';
-                    } else {
-                      var hash = win.top.location.hash;
-                      if (hash) {
-                        var len = win.top.location.href.indexOf(hash);
-                        win.top.location.href = win.location.href.slice(0, len) + '#/login';
-                      } else {
-                        win.top.location.href = '/login.html';
-                      }
-                    }
-                  } catch (error) {
-                    win.postMessage({ type: 1 }, '*');
-                  }
-                }).catch(function (e) {
-                  sessionStorage.removeItem('remind');
-                });
-              }, 2000);
-            }
-          }
-        } else if (response.data.rCode === 61) {
-          clearTimeout(initAuth);
-          initAuth = setTimeout(function () {
-            Object(eoss_element__WEBPACK_IMPORTED_MODULE_7__["MessageBox"])({
-              title: '请进行二次鉴权',
-              closeOnClickModal: false,
-              closeOnPressEscape: false,
-              showConfirmButton: false,
-              dangerouslyUseHTMLString: true,
-              scroll: false,
-              customClass: 'es-retrial-auth-msg',
-              render: function render(h, msgBox) {
-                return h('es-retrial-auth', {
-                  ref: 'auth',
-                  props: {
-                    reload: response.data.results.reload || response.data.results.refresh,
-                    group: response.data.results.retrialAuthGroupIds,
-                    type: response.data.results.retrialAuthType,
-                    msgBox: msgBox
-                  }
-                });
-              },
-              callback: function callback(res, obj) {
-                obj.$children.forEach(function (item) {
-                  item.clearTimeouts && item.clearTimeouts();
-                  return;
-                });
-              }
-            });
-          }, 1000);
-        }
+        responses(response.data);
         // eslint-disable-next-line no-undef
         return Promise.resolve(JSON.parse(JSON.stringify(response.data)));
       }
@@ -2871,6 +2779,109 @@ var replenish = function replenish(_ref15) {
   return data;
 };
 
+/**
+ * responses
+ * @desc:状态码响应
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {object} [data] - 数字或字符串型数字
+ **/
+var responses = function responses(data) {
+  if (data.rCode === 64 || data.rCode === 65 || data.rCode === 67 || data.rCode === 69) {
+    removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump', 'showLaunch']);
+    var href = '';
+    try {
+      href = win.top.location.href;
+    } catch (error) {
+      href = win.location.href;
+    }
+    if (href.indexOf('#/login') === -1 && href.indexOf('/login.html') === -1) {
+      var remind = sessionStorage.getItem('remind');
+      if (!remind) {
+        clearTimeout(loginMsg);
+        loginMsg = setTimeout(function () {
+          sessionStorage.setItem('remind', 1);
+          eoss_element__WEBPACK_IMPORTED_MODULE_7__["MessageBox"].confirm(data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', data.rCode === 69 ? {
+            confirmButtonText: '确定',
+            closeOnClickModal: false,
+            type: 'warning'
+          } : {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            closeOnClickModal: false,
+            type: 'warning'
+          }).then(function () {
+            try {
+              var loginPage = getStorage('login') || getStorage('loginPage');
+              if (loginPage) {
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'], true)) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                    src = pathname + '/' + loginPage.replace('./', '');
+                  } else {
+                    src = pathname + loginPage.replace('./', '');
+                  }
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
+              } else if (win.top.location.href.indexOf('main.html') > -1) {
+                win.top.location.href = './login.html';
+              } else {
+                var hash = win.top.location.hash;
+                if (hash) {
+                  var len = win.top.location.href.indexOf(hash);
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
+                } else {
+                  win.top.location.href = '/login.html';
+                }
+              }
+            } catch (error) {
+              win.postMessage({ type: 1 }, '*');
+            }
+          }).catch(function (e) {
+            sessionStorage.removeItem('remind');
+          });
+        }, 2000);
+      }
+    }
+  } else if (data.rCode === 61) {
+    clearTimeout(initAuth);
+    initAuth = setTimeout(function () {
+      Object(eoss_element__WEBPACK_IMPORTED_MODULE_7__["MessageBox"])({
+        title: '请进行二次鉴权',
+        closeOnClickModal: false,
+        closeOnPressEscape: false,
+        showConfirmButton: false,
+        dangerouslyUseHTMLString: true,
+        scroll: false,
+        customClass: 'es-retrial-auth-msg',
+        render: function render(h, msgBox) {
+          return h('es-retrial-auth', {
+            ref: 'auth',
+            props: {
+              reload: data.results.reload || data.results.refresh,
+              group: data.results.retrialAuthGroupIds,
+              type: data.results.retrialAuthType,
+              msgBox: msgBox
+            }
+          });
+        },
+        callback: function callback(res, obj) {
+          obj.$children.forEach(function (item) {
+            item.clearTimeouts && item.clearTimeouts();
+            return;
+          });
+        }
+      });
+    }, 1000);
+  }
+};
+
 /**
  * rgbToHsv
  * @desc:rgb转化成hsv
@@ -3527,6 +3538,7 @@ var watermark = function watermark(option) {
   receiveMessage: receiveMessage,
   removeStorage: removeStorage,
   replenish: replenish,
+  responses: responses,
   rgbToHsv: rgbToHsv,
   rmbToCapital: rmbToCapital,
   sendMessage: sendMessage,

package/package.json

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

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

@@ -34,6 +34,8 @@
           "
           :multiple="newMultiple"
           :mix="currentMix"
+          :isUnionSeal="type == 'unionSeal'"
+          :selectUserList="unionSealData || []"
           @change="
             changeSelectUser(
               $event,
@@ -49,7 +51,7 @@
               ? ['enterprise', 'employee']
               : ['enterprise']
           "
-          :params="type == 'startDraf'?otherParams:params"
+          :params="type == 'startDraf' || type == 'unionExamine'?otherParams:params"
           :tabs="currentOrgTabsParam"
           :disabled="disabled"
           :onlyName="onlyName"
@@ -180,6 +182,7 @@ export default {
         opinion: ''
       },
       onlyName: '',
+      unionSealData:[],
       currentOrgTabs: [],
       foreignOrgTabs: [],
       foreignOrgTabsParam: {},
@@ -335,10 +338,8 @@ export default {
                 }
               }
             } = res;
-            console.log(otherOrgDisabledObjId,'otherOrgDisabledObjId')
             if(otherOrgDisabledObjId){
               this.otherOrgDisabledObjId = otherOrgDisabledObjId.split(',')
-              console.log( this.otherOrgDisabledObjId,otherOrgDisabledObjId.split(','))
             }
             if (res.data.customizedConfig) {
               if (res.data.customizedConfig.currentOrgSelectorCustomized) {
@@ -407,8 +408,19 @@ export default {
             }
             this.isOpinionRequired = isOpinionRequired;
             if (this.type == 'unionSeal') {
-              this.onlyName = unionDispatchOrgName;
-              this.infoList.nextOtherOrgObj.push(unionDispatchOrgId);
+              let names = unionDispatchOrgName.split(',')
+              let ids = unionDispatchOrgId.split(',')
+              names.map((x,i) => {
+                if(x){
+                  this.unionSealData.push({
+                    showname: x,
+                    showid: ids[i]
+                  })
+
+                }
+              })
+              // this.onlyName = unionDispatchOrgName;
+              // this.infoList.nextOtherOrgObj.push(unionDispatchOrgId);
             }
             if (this.type == 'twoOfficesDispatch') {
               this.onlyName = orgNames;
@@ -487,7 +499,7 @@ export default {
         data: {
           opinion,
           pendingId,
-          nextOtherOrgObj: Array.isArray(nextOtherOrgObj)
+          nextOtherOrgObj:this.type == 'unionSeal'?this.unionSealData.map(x => x.showid).join(',') : Array.isArray(nextOtherOrgObj)
             ? nextOtherOrgObj.join(',')
             : nextOtherOrgObj,
           nextCurrentOrgObj: Array.isArray(nextCurrentOrgObj)

package/packages/flow/src/main.vue

@@ -114,11 +114,13 @@
       :selectorConfig="selectorConfig"
       :resetAppId="resetAppId"
       :taskExamine="taskExamineInfo"
+      :subParams="subParams"
       :news-info="nextNode.notificationMsg"
       @cancel="closeProcess($event)"
     />
     <Supervise
       :businessId="businessId"
+      :appId="resetAppId"
       :simpleTips="simpleTips"
       @cancel="closeProcess($event)"
       v-else-if="typeCode == 'supervise'"
@@ -745,6 +747,31 @@
           </div>
         </div>
       </div>
+      <el-form
+          ref="nextNode"
+          :model="isFlow ? nodeInfo : nextNode"
+          v-if="isEndMessage"
+          class="demo-dynamic"
+          :label-width="
+            startFlowPageEmbeddedIntoStartFlowIndex ? '100px' : '120px'
+          "
+          style="padding:0px 8px"
+          :label-position="formLabelPosition"
+        >
+      <el-form-item
+                  prop="nextItemHandleDescription"
+                  label="办结意见"
+                >
+                  <el-input
+                    placeholder="请输入办结意见"
+                    type="textarea"
+                    :autosize="{ minRows: 2 }"
+                    v-model="endMessage"
+                    @change="handleEndMessageChange"
+                  />
+                </el-form-item>
+      </el-form>
+      
       <div
         class="es-flow-buttons"
         v-if="newTypeCode != 'fenyue' && !shrink"
@@ -760,7 +787,8 @@
           <el-button class="es-button-agree" @click="subProcess('不同意。')"
             >不同意</el-button
           >
-          <el-button class="es-button-agree-save" @click="saveInfo()"
+          <el-button class="es-button-agree-save"
+          v-if="!isHideTemporarySave" @click="saveInfo()"
             >暂存</el-button
           >
         </div>
@@ -775,7 +803,7 @@
         >
           <el-button
             v-show="isSubmitButtonShowAgreeAndDisagree != 1"
-            v-for="item of hideBtn ? btnList.slice(0, 1) : btnList"
+            v-for="item of hideBtn || isHideTemporarySave ? btnList.slice(0, 1) : btnList"
             :key="item.name"
             :type="item.type"
             :style="btnStyle"
@@ -987,6 +1015,7 @@
           :type="taskReadType"
           :selectorConfig="selectorConfig"
           :simpleTips="simpleTips"
+          :subParams="subParams"
           :taskExamine="taskExamineInfo"
           :news-info="nextNode.notificationMsg"
           @cancel="closeProcess($event, 'showTaskRead')"
@@ -1183,13 +1212,17 @@ export default {
     rows: {
       type: [String, Number],
       default: 10
-    }
+    },
+    isEndMessage: { type: Boolean, default: false },
   },
   data() {
     return {
       styles: {},
       optionsKey: 0,
-      taskOperationShiftedNodeList:null,
+      endMessage:'',
+      isHideTemporarySave:false,
+      oldNextOperate:'',
+      taskOperationShiftedNodeList: null,
       currentNodeEnableItemHandleDescription: false,
       startFlowPageEmbeddedIntoStartFlowIndex: false,
       pendingItemHandleDescription: '',
@@ -1494,6 +1527,9 @@ export default {
     }
   },
   methods: {
+    handleEndMessageChange(){
+      this.$emit('endMessageChange',this.endMessage)
+    },
     getInfo() {
       if (this.typeCode == 'supervise' || this.typeCode == 'read') return;
       this.getNodeType();
@@ -1520,6 +1556,7 @@ export default {
       };
       util.ajax(params).then((res) => {
         if (res.status == 'success') {
+          this.isHideTemporarySave = res.data.nodeExtAttr.isHideTemporarySave == 1
           this.isBanInputOpinion = res.data.nodeExtAttr.isBanInputOpinion;
           this.directCreateCircularReadWhenFlowStarted =
             res.data.nodeExtAttr.directCreateCircularReadWhenFlowStarted == 1;
@@ -2215,7 +2252,7 @@ export default {
       } else if (res.fun === 'toUnionSeal()') {
         // 联合用印
         this.flowType = 'unionSeal';
-        this.flowDisabled = true;
+        this.flowDisabled = false;
         this.flowTitle = res.value;
         this.toStartDraf(res);
       } else if (res.fun == 'toTwoOfficesDispatch()') {
@@ -2586,6 +2623,12 @@ export default {
       } else {
         this.nextNode.nextUserId = '';
       }
+      if(isNextNode){
+        this.oldNextOperate = this.operationList.filter((x) => x.key == val)[0]
+          .nextOperate
+      }else{
+        this.oldNextOperate = ''
+      }
       this.options = [];
       this.selectUserList = [];
       this.radioList = [];
@@ -2614,11 +2657,12 @@ export default {
             } else {
               this.nodeInfos = item.taskNodeList;
 
-             if(this.taskOperationShiftedNodeList){
-               this.nodeInfos = item.taskNodeList.filter(
-                (x) =>this.taskOperationShiftedNodeList.indexOf(x.nodeId) == -1
-              );
-             }
+              if (this.taskOperationShiftedNodeList) {
+                this.nodeInfos = item.taskNodeList.filter(
+                  (x) =>
+                    this.taskOperationShiftedNodeList.indexOf(x.nodeId) == -1
+                );
+              }
             }
             return;
           }
@@ -2636,9 +2680,9 @@ export default {
           this.nextNode.nextNodeId = this.nodeInfos[0].nodeId;
         }
       }
-      if(isNextNode){
+      if (isNextNode) {
         this.nodeInfos = [];
-        this.nextNode.nextNodeId = val
+        this.nextNode.nextNodeId = val;
       }
       if (val === 9) {
         this.isReject = true;
@@ -2790,13 +2834,22 @@ export default {
             }
             this.$emit('startTaskRead', res);
             this.$emit('start-task-read', res);
-            if(taskOperationShiftedNodeList && taskOperationShiftedNodeList.length>0){
-              this.taskOperationShiftedNodeList = []
-              taskOperationShiftedNodeList.map(x =>{
-                this.taskOperationShiftedNodeList.push(x.nodeId) 
-                taskOperations.push({key: x.nodeId, value: x.nodeName,isNextNode: true})
-              })
+            if (
+              taskOperationShiftedNodeList &&
+              taskOperationShiftedNodeList.length > 0
+            ) {
+              this.taskOperationShiftedNodeList = [];
+              taskOperationShiftedNodeList.map((x) => {
+                this.taskOperationShiftedNodeList.push(x.nodeId);
+                taskOperations.push({
+                  key: x.nodeId,
+                  value: x.nodeName,
+                  nextOperate:x.nextOperate,
+                  isNextNode: true
+                });
+              });
             }
+            this.isHideTemporarySave = nodeInfoMap.nodeExtAttr.isHideTemporarySave == 1
             this.pendingItemHandleDescription = pendingItemHandleDescription;
             if (currentOrgSelectorParams.enableCurrentOrgConfig == 'true') {
               this.currentOrgSelectorTabs =
@@ -3056,7 +3109,7 @@ export default {
     closeProcess(val, type, closeParent) {
       if (closeParent && !this.startFlowPageEmbeddedIntoStartFlowIndex) {
         this.$refs[type].handleClosed();
-      } else if(!this.startFlowPageEmbeddedIntoStartFlowIndex){
+      } else if (!this.startFlowPageEmbeddedIntoStartFlowIndex) {
         this[type] = false;
       }
       if (
@@ -3069,7 +3122,8 @@ export default {
       if (
         val == 'taskReadAndEnd' ||
         (val == true && type != 'taskRead') ||
-        val == 'transfer' || this.typeCode == 'read'
+        val == 'transfer' ||
+        this.typeCode == 'read'
       ) {
         this.flowSuccess(true);
         // this.$emit('success');
@@ -3244,7 +3298,6 @@ export default {
      * @date 2022年5月25日
      **/
     subProcess(val, type) {
-      
       return this.$refs['nextNode'].validate((valid) => {
         if (valid) {
           if (this.isSubmitButtonShowAgreeAndDisagree == 1) {
@@ -3414,14 +3467,14 @@ export default {
             delete this.nextNode.nextOperate;
             delete this.nextNode.nextNodeId;
           }
-          if (this.nextNode.nextOperate === 9) {
+          if (this.nextNode.nextOperate === 9 || this.oldNextOperate == 9) {
             this.nextNode.isReturnRejectNode = 1;
             this.nextNode.processDefinitionId =
               this.processObj.taskExamine.processDefinitionId;
           }
           if (
-            this.nextNode.nextOperate != 0 &&
-            this.nextNode.nextOperate != 1
+            (this.nextNode.nextOperate != 0 &&
+            this.nextNode.nextOperate != 1 && this.oldNextOperate === '') || (this.oldNextOperate !== '' && this.oldNextOperate != 0 && this.oldNextOperate != 1)
           ) {
             delete this.nextNode.nextNodeId;
           }
@@ -3437,8 +3490,10 @@ export default {
           if (!this.isCanPreAddSign || this.nextNode.isAddSign != '1') {
             delete this.nextNode.addSignMode;
           }
+         
           let params = {
             ...this.nextNode,
+            nextOperate:this.oldNextOperate!==''?this.oldNextOperate : this.nextNode.nextOperate, 
             pendingId: this.pendingId,
             opinion:
               this.isForceDisplayDefaultOptionForPrefix &&

package/packages/flow/src/selectUser.vue

@@ -68,18 +68,22 @@
         :title="title"
         max="5"
         :mix="mix"
+        :min="isUnionSeal ? 1 : 0"
         :disabled="!isCustomUser || isCurrentNodeForbiddenChangeCandidate == 1"
-        :filterable="Boolean(isCustomUser)"
+        :filterable="Boolean(isCustomUser && !isUnionSeal)"
         :class="
-          isCustomUser && isCurrentNodeForbiddenChangeCandidate == 0
+          isCustomUser &&
+          isCurrentNodeForbiddenChangeCandidate == 0 &&
+          !isUnionSeal
             ? ''
             : 'no-icon'
         "
+        :select="isUnionSeal == false"
         :where="newWhere"
         :multiple="newMultiple"
         @cancel="cancelSelectUser"
         @change="getSelectUser"
-        :param="{...newParams,info:'no'}"
+        :param="{ ...newParams, info: 'no' }"
         :disableds="disableds"
         ><i class="es-icon-user"></i
       ></es-selector>
@@ -103,11 +107,15 @@ export default {
     tabs: {
       type: Object
     },
+    isUnionSeal: {
+      type: Boolean,
+      default: false
+    },
     nextUser: {
       default: () => []
     },
-    disableds:{
-      type:Array,
+    disableds: {
+      type: Array,
       default: () => []
     },
     radioList: {
@@ -185,9 +193,15 @@ export default {
       newRadioList: []
     };
   },
-  computed:{
-    newWhere(){
-      return {mid:`${JSON.parse(util.getStorage('mainConfig')).userModel.orgId}-org-1`,filid:JSON.parse(util.getStorage('mainConfig')).userModel.orgId,...this.where}
+  computed: {
+    newWhere() {
+      return {
+        mid: `${
+          JSON.parse(util.getStorage('mainConfig')).userModel.orgId
+        }-org-1`,
+        filid: JSON.parse(util.getStorage('mainConfig')).userModel.orgId,
+        ...this.where
+      };
     }
   },
   watch: {

package/packages/flow/src/startTaskRead.vue

@@ -196,6 +196,10 @@ export default {
     selectorConfig: { type: [Object, undefined], default: undefined },
     param: { type: Object, default: () => {} },
     taskExamine: { type: Object, default: () => {} },
+    subParams:{
+      type: [Object, undefined],
+      default: undefined
+    },
     readParams: {
       type: [Object, undefined],
       default: undefined
@@ -601,6 +605,9 @@ export default {
             if (this.readParams) {
               params = { ...params, ...this.readParams };
             }
+            if(this.subParams){
+              params = { ...params, ...this.subParams };
+            }
             util
               .ajax({
                 url: taskReadHtml,

package/packages/flow/src/supervise.vue

@@ -65,12 +65,13 @@
 import { toTaskSupervise, toTaskSuperviseSub } from 'eoss-ui/src/config/api';
 import util from 'eoss-ui/src/utils/util';
 export default {
-  name:'supervise',
+  name: 'supervise',
   props: {
     businessId: {
       type: String,
       default: ''
     },
+    appId: { type: String, default: '' }
   },
   data() {
     return {
@@ -102,7 +103,8 @@ export default {
           urgeUserIds: pendingUserIds,
           notificationType: noticeType.join(','),
           notificationMessage: notifyMessage,
-          businessId: this.businessId
+          businessId: this.businessId,
+          appId: this.appId
         }
       };
       this.loading = util.loading(this.$loading, '提交中...');
@@ -124,6 +126,7 @@ export default {
           url: toTaskSupervise,
           params: {
             businessId: this.businessId,
+            appId: this.appId,
             userId: util.getStorage('userId')
           }
         })

package/packages/flow-group/src/main.vue

@@ -437,6 +437,7 @@
       @startTaskRead="handleTaskRead"
       @success="handleSuccess"
       @save="handleSave"
+      @endMessageChange="handleEndMessageChange"
       :closeParent="closeParent"
     ></es-flow>
     <slot></slot>
@@ -656,6 +657,9 @@ export default {
           this.injector.handleChangeData({ appId: this.taskExamineAppId });
       }
     },
+    handleEndMessageChange(val){
+      this.$emit('endMessageChange',val)
+    },
     handleSuccess() {
       if (this.closeDialog && this.esDialog) {
         this.esDialog.handleClose();