eoss-ui 0.4.51 → 0.4.53

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="[
@@ -212,6 +213,7 @@
                 />
               </el-form-item>
               <el-form-item
+              v-if="isNextUser"
                 :prop="isShowNextUser ? 'nextUserId' : 'nextOrgId'"
                 :label="isShowNextUser ? '下步办理人' : '办理对象'"
               >
@@ -241,6 +243,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 +380,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">
@@ -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,13 +962,16 @@ 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'
+              },
               method: 'post',
               data: params
             })
@@ -1488,6 +1517,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 +1620,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 +1633,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 +1658,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 +1956,7 @@ export default {
                 }
               });
             }
+            this.isMainSubProcess = res.data.isMainSubProcess === true;
             this.isCustomPreset = isCustomPreset;
             this.isPreset = isPreset;
             this.presetTaskNodeMap = presetTaskNodeMap;
@@ -1895,6 +1966,7 @@ export default {
             this.getNodeInfo();
           } else {
             if (res.status === 'taskCompleted') {
+              this.$emit('shrink', true)
               this.shrinkAbled = true;
               this.$message.warning(res.message || '系统错误，请联系管理员！');
             } else {
@@ -2069,13 +2141,13 @@ 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' &&
             this.isSpecial &&
             !this.isReject &&
-            this.nodeInfos.length != 0
+            this.nodeInfos.length != 0 && this.isNextUser
           ) {
             if (this.isShowNextUser) {
               if (
@@ -2143,8 +2215,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

@@ -398,13 +398,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 +458,8 @@ export default {
             const {
               appId,
               businessId,
+              bCode,
+              bName,
               choiceDeptId,
               choiceOrgId,
               businessName,
@@ -463,6 +467,8 @@ export default {
             } = this.taskExamine;
             let params = {
               ...this.nextNode,
+              bCode,
+              bName,
               appId,
               businessId,
               choiceDeptId,
@@ -489,7 +495,9 @@ export default {
               .ajax({
                 url: taskReadHtml,
                 params: { taskAction: this.type },
-                headers: { Accept: 'application/json,text/plain' },
+                headers: {
+                  Accept: 'application/json,text/plain'
+                },
                 method: 'post',
                 data: params
               })

package/packages/handler/src/main.vue

@@ -1,8 +1,8 @@
 <template>
   <ul class="es-handler">
     <li
-      v-for="item in lists"
-      :key="item.type"
+      v-for="(item, index) in lists"
+      :key="index"
       class="es-handler-item"
       v-if="!item.hide"
     >
@@ -141,9 +141,20 @@ export default {
   },
   computed: {
     lists() {
+      console.log(111);
       if (this.data === undefined) {
+        if (Object.keys(this.hide).length) {
+          this.list.forEach((item) => {
+            item.hide = this.hide[item.type];
+          });
+        }
         return this.list;
       } else {
+        if (Object.keys(this.hide).length) {
+          this.data.forEach((item) => {
+            item.hide = this.hide[item.type];
+          });
+        }
         return this.data;
       }
     },
@@ -157,19 +168,6 @@ export default {
       return true;
     }
   },
-  watch: {
-    hide: {
-      immediate: true,
-      deep: true,
-      handler(val) {
-        if (val !== undefined) {
-          this.lists.forEach((item) => {
-            item.hide = val[item.type];
-          });
-        }
-      }
-    }
-  },
   data() {
     return {
       date: '',

package/packages/login/src/main.vue

@@ -326,6 +326,8 @@ import {
   doQrLogin,
   getLoginCode,
   doCodeLogin,
+  getTwoFactorLoginCode,
+  doTwoFactorLogin,
   doWechatQrLogin,
   doCaLogin
 } from 'eoss-ui/src/config/api.js';
@@ -447,6 +449,14 @@ export default {
       type: String,
       default: doCodeLogin
     },
+    getTwoFactorLoginCode: {
+      type: String,
+      default: getTwoFactorLoginCode
+    },
+    doTwoFactorLogin: {
+      type: String,
+      default: doTwoFactorLogin
+    },
     doWechatQrLogin: {
       type: String,
       default: doWechatQrLogin
@@ -903,6 +913,7 @@ export default {
       this.app = res.appName || res.subsystemName;
       this.qrimg = res.qrimg || res.qrImg;
       this.loginModel = res.loginModel;
+      // this.loginModel = '0,3,11,6,9,2';
       this.loginBackgroundImg = res.loginBackgroundUrl
         ? res.loginBackgroundUrl.split(',')
         : null;
@@ -979,8 +990,9 @@ export default {
           return false;
         }
         data = {
-          target: this.formData.username,
+          username: this.formData.username,
           targetType: this.passModifyModel.indexOf('11') > -1 ? 'EMAIL' : 'SMS'
+          // targetType: 'SMS'
         };
       } else {
         if (!this.formData.target) {
@@ -1012,7 +1024,8 @@ export default {
       util
         .ajax({
           method: 'post',
-          url: this.getLoginCode,
+          url:
+            this.active == 2 ? this.getTwoFactorLoginCode : this.getLoginCode,
           data: data
         })
         .then((res) => {
@@ -1056,6 +1069,19 @@ export default {
                   identifyingCode: this.formData.identifyingCode,
                   identifyingId: this.identifyingId
                 }
+              : this.active == '2'
+              ? {
+                username: this.formData.username,
+                  password:
+                    this.secret && this.isEncrypt
+                      ? util.esmEncrypt({
+                          data: this.formData.password,
+                          key: this.secret
+                        })
+                      : this.formData.password,
+                      targetType: this.passModifyModel.indexOf('11') > -1 ? 'EMAIL' : 'SMS',
+                      verificationCode:this.formData.identifyingCode
+              }
               : {
                   target: this.formData.target,
                   verificationCode: this.formData.verificationCode,
@@ -1091,7 +1117,12 @@ export default {
       util
         .ajax({
           method: 'post',
-          url: this.active == '0' ? this.actionUrl : this.doCodeLogin,
+          url:
+            this.active == '0'
+              ? this.actionUrl
+              : this.active == '2'
+              ? this.doTwoFactorLogin
+              : this.doCodeLogin,
           data: extUserBindHandleId
             ? { ...data, extUserBindHandleId: extUserBindHandleId }
             : data