eoss-ui 0.4.55 → 0.4.57

package/packages/flow/src/main.vue

@@ -169,6 +169,7 @@
               <el-select
                 v-model="nextNode.nextOperate"
                 :placeholder="`请选择下步操作`"
+                :disabled="operationList && operationList.length == 1"
                 @change="selecNext($event, true)"
               >
                 <el-option
@@ -191,6 +192,7 @@
                 <el-select
                   v-model="nextNode.nextNodeId"
                   :placeholder="`请选择下步节点`"
+                  :disabled="nodeInfos && nodeInfos.length == 1"
                   @change="selecNext($event, false)"
                 >
                   <el-option
@@ -213,7 +215,7 @@
                 />
               </el-form-item>
               <el-form-item
-              v-if="isNextUser"
+                v-if="isNextUser"
                 :prop="isShowNextUser ? 'nextUserId' : 'nextOrgId'"
                 :label="isShowNextUser ? '下步办理人' : '办理对象'"
               >
@@ -243,21 +245,51 @@
                   :tabs="nextUserTabs"
                 />
               </el-form-item>
-              <!-- <el-form-item
+              <el-form-item
                 v-if="isHideCurrentOrg"
                 prop="nextCurrentOrgObj"
                 :label="currentOrgName ? currentOrgName : '本单位'"
               >
                 <SelectUser
-                  :nextUser="nextNode.nextCurrentOrgObj"
+                  :nextUser="nextCurrentOrgObjSelect"
                   multiple
                   mix
-                  :selectUserList="selectNextCurrentOrgObjList"
-                  @change="changeSelectUser($event, 'nextCurrentOrgObj', true)"
+                  @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
                   :types="['department', 'employee']"
                   :params="{ filid: userModel.orgId }"
                 />
-              </el-form-item> -->
+              </el-form-item>
+              <el-form-item
+                v-if="isHideOtherOrg"
+                prop="nextOtherOrgObj"
+                :label="otherOrgName ? otherOrgName : '外单位'"
+              >
+                <SelectUser
+                  :nextUser="nextOtherOrgObjSelect"
+                  multiple
+                  mix
+                  @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
+                  :types="['enterprise']"
+                  :params="{ filid: 'all' }"
+                />
+              </el-form-item>
+              <el-form-item
+                v-if="isMainSubProcess"
+                prop="mainSubId"
+                label="主办"
+              >
+                <el-select
+                  v-model="nextNode.mainSubId"
+                  :placeholder="`请选择主办`"
+                >
+                  <el-option
+                    v-for="items in subProcessColumns"
+                    :key="items.id"
+                    :label="items.name"
+                    :value="items.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
               <TimeLimit
                 v-if="nodeType !== 0 && isLimitedTimeHandling === 1"
                 :newsList="newsList"
@@ -643,6 +675,9 @@ export default {
   data() {
     return {
       userModel: {},
+      nextOtherOrgObjSelect: [],
+      subProcessColumns: [],
+      nextCurrentOrgObjSelect: [],
       loading: null, // 加载中
       newTypeCode: '',
       NodeName: '', // 当前节点值
@@ -766,15 +801,20 @@ export default {
         removeSignUserId: [], // 减签办理人
         nextUserId: [], // 下步办理人
         nextOrgId: [], //办理对象
+        nextCurrentOrgObj: [],
         nextCurrentOrgObjSerialId: [], //本单位用户
+        nextOtherOrgObj: [], //外单位
         nextReadUserId: [], //分阅用户
         presetReadUserId: [], //自动分阅
         handleExplain: '', //办理意见
         notificationType: [], // 通知方式
-        isLimitedTime: '2' // 是否限时办理
+        isLimitedTime: '2', // 是否限时办理
+        mainSubId: ''
       },
       nodeInfos: [], // 下步节点选择数组
       nextFlowNode: '',
+      currentOrgName: '', //本单位名称
+      otherOrgName: '', //外单位名称
       nodeInfo: {
         nextNode: '',
         nextUser: '',
@@ -853,6 +893,39 @@ export default {
     }
   },
   methods: {
+    getsubProcessColumns() {
+      if (!this.isMainSubProcess) return [];
+      let data = [];
+      let obj = { name: '[部门员工]-' };
+      if (this.nextCurrentOrgObjSelect.length > 0) {
+        this.nextCurrentOrgObjSelect.map((x) => {
+          if (x.stype == 'employee') {
+            obj.name = !obj.value
+              ? obj.name + x.showname
+              : obj.name + ',' + x.showname;
+            obj.value = obj.value
+              ? obj.value + ',' + x.showid
+              : 'employee-' + x.showid;
+          } else {
+            data.push({
+              name: '[部门]' + x.showname,
+              value: 'department-' + x.showid
+            });
+          }
+        });
+      }
+      obj.value && data.push(obj);
+      if (this.nextOtherOrgObjSelect.length > 0) {
+        this.nextOtherOrgObjSelect.map((x) => {
+          data.push({
+            name: '[企业]' + x.showname,
+            value: 'enterprise-' + x.showid
+          });
+        });
+      }
+      this.subProcessColumns = data;
+      // return data;
+    },
     // 分阅是否多选
     isReadMultiple(nextReadUserSelectType) {
       if (nextReadUserSelectType == 1) {
@@ -1622,6 +1695,7 @@ export default {
       if (type) {
         this.isNextUser = false;
         this.isShowNode = false;
+        this.isMainSubProcess = false;
         this.nextNode.nextNodeId = '';
         this.nextNode.isReturnSubmitter = 0;
         this.nextNode.isUndertakeReply = 0;
@@ -1772,6 +1846,8 @@ export default {
                 choiceOrgId,
                 choiceDeptId,
                 pOrgId,
+                currentOrgName,
+                otherOrgName,
                 taskExamine,
                 nodeInfoMap,
                 canRemoveSignUserList,
@@ -1788,6 +1864,8 @@ export default {
               }
             } = res;
             this.$emit('startTaskRead', res);
+            this.currentOrgName = currentOrgName
+            this.otherOrgName = otherOrgName
             this.endFlowInfo.choiceOrgId = choiceOrgId;
             this.endFlowInfo.choiceDeptId = choiceDeptId;
             this.endFlowInfo.pendingId = this.pendingId;
@@ -1956,7 +2034,7 @@ export default {
                 }
               });
             }
-            this.isMainSubProcess = res.data.isMainSubProcess === true;
+            this.isMainSubProcess = res.data.isMainSubProcess == 'true';
             this.isCustomPreset = isCustomPreset;
             this.isPreset = isPreset;
             this.presetTaskNodeMap = presetTaskNodeMap;
@@ -1966,7 +2044,7 @@ export default {
             this.getNodeInfo();
           } else {
             if (res.status === 'taskCompleted') {
-              this.$emit('shrink', true)
+              this.$emit('shrink', true);
               this.shrinkAbled = true;
               this.$message.warning(res.message || '系统错误，请联系管理员！');
             } else {
@@ -2147,7 +2225,8 @@ export default {
             this.nextNode.isRemoveSign != '1' &&
             this.isSpecial &&
             !this.isReject &&
-            this.nodeInfos.length != 0 && this.isNextUser
+            this.nodeInfos.length != 0 &&
+            this.isNextUser
           ) {
             if (this.isShowNextUser) {
               if (
@@ -2197,7 +2276,10 @@ export default {
             this.$message.warning('请选择输入审批意见');
             return;
           }
-
+          if (this.isHideCurrentOrg && !this.nextNode.nextCurrentOrgObjJson) {
+            this.$message.warning(`请选择${this.currentOrgName || '本单位'}`);
+            return;
+          }
           let str = '';
           if (this.value) {
             str = this.value.replace(/\s+/g, '');
@@ -2302,6 +2384,61 @@ export default {
           return false;
         }
       });
+    },
+    // 单位选择完回调
+    disposeAppUnit(res, type) {
+      let label = type.substring(0, type.lastIndexOf('Select'));
+      this.nextNode[label + 'Name'] = '';
+      res.options && (this[type] = res.options);
+      let obj = {};
+      // if (typeof res.mixList == 'array')
+      res.mixList && (this.nextNode[label] = res.mixList.join('|'));
+      res.options.map((item) => {
+        if (obj[item.stype]) {
+          obj[item.stype].push(item.showname);
+        } else {
+          obj[item.stype] = [item.showname];
+        }
+      });
+      for (let key in obj) {
+        if (
+          key === 'enterprise' &&
+          this.nextNode[label + 'Name'].indexOf('[企业]') == -1
+        ) {
+          this.nextNode[label + 'Name'] = this.nextNode[label + 'Name']
+            ? this.nextNode[label + 'Name'] +
+              '|' +
+              '[企业]-' +
+              obj[key].join(',')
+            : '' + '[企业]-' + obj[key].join(',');
+        }
+        if (
+          key === 'department' &&
+          this.nextNode[label + 'Name'].indexOf('[部门]') == -1
+        ) {
+          this.nextNode[label + 'Name'] = this.nextNode[label + 'Name']
+            ? this.nextNode[label + 'Name'] +
+              '|' +
+              '[部门]-' +
+              obj[key].join(',')
+            : '' + '[部门]-' + obj[key].join(',');
+        }
+        if (
+          key === 'employee' &&
+          this.nextNode[label + 'Name'].indexOf('[部门员工]') == -1
+        ) {
+          this.nextNode[label + 'Name'] = this.nextNode[label + 'Name']
+            ? this.nextNode[label + 'Name'] +
+              '|' +
+              '[部门员工]-' +
+              obj[key].join(',')
+            : '' + '[部门员工]-' + obj[key].join(',');
+        }
+      }
+      // this.nextNode[label + 'Name'] = obj.enterprise?;
+      this.nextNode[label + 'SerialId'] = res.nextUser.join(',');
+      this.nextNode[label + 'Json'] = JSON.stringify(res.options);
+      this.getsubProcessColumns();
     }
   }
 };

package/packages/flow/src/startTaskRead.vue

@@ -179,7 +179,7 @@ export default {
       },
       mixList: [],
       newSelectUserList: [],
-      orgId: 3,
+      orgId: '',
       noticeList: [],
       userOptions: [],
       selectCheck: [],
@@ -197,18 +197,18 @@ export default {
         tab = {
           employee: {
             param: {
-              filid: sessionStorage.getItem('orgId'),
+              filid: this.orgId,
               name: '本单位用户'
             }
           },
-          department: { param: { filid: sessionStorage.getItem('orgId') } },
+          department: { param: { filid: this.orgId } },
           enterprise: {}
         };
       } else {
         tab = {
           employee: {
             param: {
-              filid: sessionStorage.getItem('orgId')
+              filid: this.orgId
             }
           }
         };
@@ -218,6 +218,9 @@ export default {
   },
   mounted() {
     this.getFind();
+    if(util.getStorage('mainConfig')){
+      this.orgId = JSON.parse(util.getStorage('mainConfig')).userModel.orgId
+    }
   },
   methods: {
     toTaskTransfer() {
@@ -265,14 +268,14 @@ export default {
         this.multiple = false;
       }
       if (val == 1 || val == 2 || val == 5) {
-        this.params.filid = util.getStorage('orgId');
+        this.params.filid = this.orgId;
         if (choiceOrgId) {
           this.params.filid = choiceOrgId;
         }
       }
       if (val == 5 || val == 6) {
-        this.params.filid = util.getStorage('orgId');
-        this.params.deptid = util.getStorage('orgId');
+        this.params.filid = this.orgId;
+        this.params.deptid = this.orgId;
         if (choiceDeptId) {
           this.params.deptid = choiceDeptId;
         }
@@ -281,14 +284,14 @@ export default {
         }
       }
       if (val == 15 || val == 16) {
-        this.params.filid = util.getStorage('orgId');
+        this.params.filid = this.orgId;
         if (pOrgId) {
           this.params.filid = pOrgId;
         }
       }
     },
     isMultiple() {
-      let orgId = sessionStorage.getItem('orgId');
+      let orgId = this.orgId;
       if (this.configInfo.selectPersonValue == 1) {
         this.multiple = false;
         this.params.filid = orgId;

package/packages/form/src/main.vue

@@ -4316,7 +4316,14 @@ export default {
         } else {
           this.$refs.esForm.validate(async (valid, fields, triggers) => {
             if (valid) {
-              this.$emit('submit', this.models, res);
+              this.$emit(
+                'submit',
+                this.getNewValue(
+                  util.extend({}, this._value, this.models),
+                  res
+                ),
+                res
+              );
             } else {
               this.setScroll(valid, triggers, this.$refs.scrollbar);
             }
@@ -4339,7 +4346,7 @@ export default {
           'stepPrev',
           res,
           this.models,
-          this.getNewValue(this.models, res)
+          this.getNewValue(util.extend({}, this._value, this.models), res)
         );
       } else if (res.event === 'stepNext') {
         this.$refs.esForm.validate((valid, fields, triggers) => {
@@ -4350,7 +4357,7 @@ export default {
               'stepNext',
               res,
               this.models,
-              this.getNewValue(this.models, res)
+              this.getNewValue(util.extend({}, this._value, this.models), res)
             );
           } else {
             this.setScroll(valid, triggers, this.$refs.scrollbar);
@@ -4361,14 +4368,14 @@ export default {
           'click',
           res,
           this.models,
-          this.getNewValue(this.models, res)
+          this.getNewValue(util.extend({}, this._value, this.models), res)
         );
       } else {
         this.$emit(
           'click',
           res,
           this.models,
-          this.getNewValue(this.models, res)
+          this.getNewValue(util.extend({}, this._value, this.models), res)
         );
       }
     },
@@ -4753,7 +4760,7 @@ export default {
           models[handle.table] = handle.join ? ids.join(',') : ids;
         }
       }
-
+      let obj = JSON.parse(JSON.stringify(models));
       if (this.within) {
         //within:把提交数据装到指定属性中
         let newData = {};
@@ -4778,7 +4785,6 @@ export default {
       if (this.formatSubmit) {
         //formatSubmit:提交数据装到masterData或者指定属性中
         let masterData = {};
-        let obj = JSON.parse(JSON.stringify(models));
         if (typeof this.formatSubmit === 'string') {
           masterData[this.formatSubmit] = obj;
         } else {

package/packages/login/src/main.vue

@@ -45,7 +45,7 @@
           ></i>
         </div>
         <div class="es-login-form-box">
-          <template v-if="isShow(active) && (active == 0 || active == 2)">
+          <template v-if="isShow(active) && (active == 0 || active == 12)">
             <el-form ref="login" class="es-login-form" :model="formData">
               <div class="es-login-title">
                 <span class="es-login-title-content">{{ title }}</span>
@@ -91,7 +91,13 @@
               <el-form-item
                 size="large"
                 prop="identifyingCode"
-                :rules="[{ required: true, message: '验证码不能为空' }]"
+                :rules="[
+                  {
+                    required: true,
+                    message: '验证码不能为空',
+                    trigger: 'change'
+                  }
+                ]"
                 v-if="imgCode || showVerifyCode"
               >
                 <el-input
@@ -110,7 +116,7 @@
                     <el-button
                       class="es-get-code"
                       type="primary"
-                      v-show="active == 2 && showVerifyCode"
+                      v-show="active == 12 && showVerifyCode"
                       :disabled="disabled"
                       @click.stop="getCode"
                       >{{ btnText }}</el-button
@@ -582,17 +588,16 @@ export default {
         ? {
             0: { type: '0', icon: 'es-icon-shuru', name: '账号登录' },
             1: { type: '1', icon: 'es-icon-usb-key', name: '证书登录' },
-            2: { type: '2', icon: 'es-icon-shuru', name: '账号登录' },
             3: { type: '3', icon: 'es-icon-saoma', name: '扫码登录' },
             6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
             7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
             9: { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
-            11: { type: '11', icon: 'es-icon-youxiang', name: '邮箱登录' }
+            11: { type: '11', icon: 'es-icon-youxiang', name: '邮箱登录' },
+            12: { type: '12', icon: 'es-icon-shuru', name: '账号登录' } //双因素
           }
         : {
             0: { type: '0', icon: 'es-icon-jianpan', name: '账号登录' },
             1: { type: '1', icon: 'es-icon-ca', name: '证书登录' },
-            2: { type: '2', icon: 'es-icon-jianpan', name: '账号登录' },
             3: { type: '3', icon: 'es-icon-qrcode', name: '扫码登录' },
             6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
             7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
@@ -601,7 +606,8 @@ export default {
               type: '11',
               icon: 'es-icon-wodeyouxiang',
               name: '邮箱登录'
-            }
+            },
+            12: { type: '12', icon: 'es-icon-jianpan', name: '账号登录' } //双因素
           };
     },
     icons() {
@@ -621,8 +627,9 @@ export default {
     },
     showVerifyCode() {
       return (
-        this.passModifyModel.indexOf('6') > -1 ||
-        this.passModifyModel.indexOf('11') > -1
+        this.passModifyModel &&
+        (this.passModifyModel.indexOf('6') > -1 ||
+          this.passModifyModel.indexOf('11') > -1)
       );
     }
   },
@@ -913,7 +920,6 @@ 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;
@@ -978,7 +984,7 @@ export default {
       }
       let data = {};
       let flag = false;
-      if (this.active == 2) {
+      if (this.active == 12) {
         if (!this.formData.username) {
           this.$refs.login.validateField('username');
           return false;
@@ -1019,13 +1025,14 @@ export default {
         } else {
           this.btnText = '重新获取';
           this.disabled = false;
+          this.submit = false;
         }
       }, 1000);
       util
         .ajax({
           method: 'post',
           url:
-            this.active == 2 ? this.getTwoFactorLoginCode : this.getLoginCode,
+            this.active == 12 ? this.getTwoFactorLoginCode : this.getLoginCode,
           data: data
         })
         .then((res) => {
@@ -1069,9 +1076,9 @@ export default {
                   identifyingCode: this.formData.identifyingCode,
                   identifyingId: this.identifyingId
                 }
-              : this.active == '2'
+              : this.active == '12'
               ? {
-                username: this.formData.username,
+                  username: this.formData.username,
                   password:
                     this.secret && this.isEncrypt
                       ? util.esmEncrypt({
@@ -1079,9 +1086,10 @@ export default {
                           key: this.secret
                         })
                       : this.formData.password,
-                      targetType: this.passModifyModel.indexOf('11') > -1 ? 'EMAIL' : 'SMS',
-                      verificationCode:this.formData.identifyingCode
-              }
+                  targetType:
+                    this.passModifyModel.indexOf('11') > -1 ? 'EMAIL' : 'SMS',
+                  verificationCode: this.formData.identifyingCode
+                }
               : {
                   target: this.formData.target,
                   verificationCode: this.formData.verificationCode,
@@ -1120,7 +1128,7 @@ export default {
           url:
             this.active == '0'
               ? this.actionUrl
-              : this.active == '2'
+              : this.active == '12'
               ? this.doTwoFactorLogin
               : this.doCodeLogin,
           data: extUserBindHandleId
@@ -1256,6 +1264,7 @@ export default {
             type: 'success',
             duration: 1500,
             onClose: () => {
+              sessionStorage.removeItem('remind');
               if (this.toUrl) {
                 window.location.href = this.toUrl;
               } else if (results.doorIndex && this.doorIndex) {

package/packages/retrial-auth/index.js

@@ -0,0 +1,5 @@
+import EsRetrialAuth from './src/main';
+
+EsRetrialAuth.install = Vue => Vue.component(EsRetrialAuth.name, EsRetrialAuth);
+
+export default EsRetrialAuth;