eoss-ui 0.7.66 → 0.7.67

package/packages/flow/src/processForm.vue

@@ -17,7 +17,7 @@
       <div
         :style="`height:${
           showBtn ? '430px' : 'auto'
-        }; overflow-y: auto; margin-bottom: 10px`"
+        }; overflow-y:${showBtn ? 'auto' : 'hidden'} ; margin-bottom: 10px`"
       >
         <el-form-item
           v-show="showBtn"
@@ -136,7 +136,38 @@
             :params="params"
           />
         </el-form-item> -->
+         <el-form-item
+                  v-if="isHideCurrentOrg"
+                  prop="nextCurrentOrgObj"
+                  label="本单位"
+                >
+                  <SelectUser
+                    :nextUser="nextCurrentOrgObjSelect"
+                    multiple
+                    mix
+                    @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
+                    :showTooltip="showTooltip"
+                    :types="['employee', 'persongroup']"
+                    :params="currentOrgSelectorParams"
+                  />
+                </el-form-item>
+                <el-form-item
+                  v-if="isHideOtherOrg"
+                  label="外单位"
+                >
+                  <SelectUser
+                    :nextUser="nextOtherOrgObjSelect"
+                    multiple
+                    :showTooltip="showTooltip"
+                    mix
+                    :where="{ filid: 'other' }"
+                    @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
+                    :types="['enterprise', 'filgroup']"
+                    :params="foreignOrgSelectorParams"
+                  />
+                </el-form-item>
         <el-form-item
+        v-if="!isHideOtherOrg && !isHideCurrentOrg"
           :prop="isShowNextUser ? 'nextUser' : 'nextOrgId'"
           :label="isShowNextUser ? '下步办理人' : '办理对象'"
         >
@@ -474,7 +505,8 @@ export default {
     keyCount: {
       type: [Number, String],
       default: 0
-    }
+    },
+    selectorParams:{type:Object,default:()=>{}}
   },
   data() {
     return {
@@ -550,6 +582,13 @@ export default {
       isShowNextUser: true,
       oldMessage: '',
       mixOrgIdList: [], //办理对象混选
+      subProcessColumns: [],
+      nextOtherOrgObjSelect: [],
+      nextCurrentOrgObjSelect: [],
+      isHideCurrentOrg:false,
+      isHideOtherOrg:false,
+      currentOrgSelectorParams:{filid: JSON.parse(util.getStorage('mainConfig')).userModel.orgId,only_filid:true},
+      foreignOrgSelectorParams:{filid: 'all', nofilid: 1},
       nextNode: {
         nodeName: '',
         customLimitTime: '',
@@ -693,6 +732,8 @@ export default {
       let mainConfig = util.getStorage('mainConfig');
       if (mainConfig) {
         this.userModel = JSON.parse(mainConfig).userModel;
+        this.foreignOrgSelectorParams.nofilid = this.userModel.orgId
+        this.foreignOrgSelectorParams.roleid = this.currentOrgSelectorParams.roleid = this.selectorParams.roleid
       } else {
         util
           .ajax({ url: loginUserInfo })
@@ -700,6 +741,8 @@ export default {
             const { status, data } = res;
             if (status == 'success') {
               this.userModel = data;
+               this.foreignOrgSelectorParams.nofilid = this.userModel.orgId
+        this.foreignOrgSelectorParams.roleid = tthis.currentOrgSelectorParams.roleid = this.selectorParams.roleid
             } else {
               let msg = res.msg || '系统错误，请联系管理员！';
               this.$message.error(msg);
@@ -802,6 +845,95 @@ export default {
       this.nextNode[type] = nextUser;
       this.mixOrgIdList = mixList;
     },
+    getsubProcessColumns() {
+      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;
+    },
+        // 单位选择完回调
+    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?;
+      if (!this.currentNodeIsCircularReadNode) {
+        this.nextNode[label + 'SerialId'] = res.nextUser.join(',');
+        this.nextNode[label + 'Json'] = JSON.stringify(res.options);
+      }
+      this.getsubProcessColumns();
+    },
     getNodeType() {
       util
         .ajax({
@@ -881,13 +1013,15 @@ export default {
             nextReadUserId,
             nextOrgId,
             newOpinion,
-            customLimitTime
+            customLimitTime,
+            nextOtherOrgObj,
+            nextCurrentOrgObj
           } = this.nextNode;
           // if (noticeType.length === 0) {
           //   return this.$message.warning('请选择通知方式');
           // }
           if (this.isShowNextUser) {
-            if (nextUser == '' || (this.multiple && nextUser.length == 0)) {
+            if ((nextUser == '' || (this.multiple && nextUser.length == 0)) && !this.isHideCurrentOrg && !this.isHideOtherOrg) {
               return this.$message.warning('请选择下步办理人');
             }
           } else {
@@ -895,6 +1029,9 @@ export default {
               return this.$message.warning('请选择办理对象');
             }
           }
+          if((this.isHideOtherOrg || this.isHideCurrentOrg) && !nextCurrentOrgObj && !nextOtherOrgObj){
+            return this.$message.warning('请选择办理对象');
+          }
           if (this.showBtn) {
             this.loading = true;
           } else {
@@ -949,6 +1086,12 @@ export default {
               return;
             }
           }
+          if(this.isHideCurrentOrg){
+            params.nextCurrentOrgObj = nextCurrentOrgObj
+          }
+          if(this.isHideOtherOrg){
+            params.nextOtherOrgObj = nextOtherOrgObj
+          }
           if (this.activeNames != '1') delete params.customPresetUserJson;
           if (this.isFreeStartFlow || this.formType === 'readTransfer') {
             let newParm = {};
@@ -1083,7 +1226,15 @@ export default {
               this.params = params;
             }
             // this.isReadMultiple(nodeExtAttr.userSelectionType);
-
+            if (nodeExtAttr.nodeType === 1 || nodeExtAttr.nodeType === 2) {
+           
+                this.isHideCurrentOrg =
+                  nodeExtAttr.isHideCurrentOrg == 1 ? false : true; //判断是否隐藏本单位
+                this.isHideOtherOrg = nodeExtAttr.isHideOtherOrg == 1 ? false : true; //判断是否隐藏外单位
+              } else {
+                this.isHideCurrentOrg = false;
+                this.isHideOtherOrg = false;
+              }
             nextUserList.map((item) => {
               if (
                 this.multiple &&
@@ -1237,6 +1388,9 @@ export default {
         userId: util.getStorage('userId'),
         businessId: this.businessId
       };
+      if(!this.shwowBtn){
+        params.taskAction = "toStartFlowWithoutTempSave"
+      }
       // 获取节点
       util
         .ajax({ url: toStartFlow, params })

package/packages/main/src/simplicityTop/index.vue

@@ -857,7 +857,7 @@ export default {
             num: 0
           },
           {
-            badge: true,
+            badge: false,
             icon: 'es-icon-solid-yiban',
             id: '259600a64a6840a4952251fe0a7bd890',
             text: '已办事项',
@@ -898,18 +898,18 @@ export default {
           {
             badge: true,
             icon: 'es-icon-juqiangongwen',
-            id: '1648d7d7a41d4e389eae002f0cf7270d',
+            id: 'bbc03189766441e6a46550c556d61f03',
             text: '拒签公文',
             icons: '',
-            url: '/archives-ui/webpack/index.html#/receipt/rejectedList',
+            url: '/archives-ui/webpack/index.html#/dispatch/rejectedList',
             target: 'stage',
-            sort: 7,
+            sort: 4,
             remindurl: '',
-            pid: 'ec4a6e89b1b346a4a2e8f4245e315da3',
+            pid: '7fd13c86f596417b95d2b7622906f70f',
             level: 3,
             quickicons: '',
             appType: '0',
-            appCode: 'recRejectedList',
+            appCode: 'rejectedList',
             urlopenmode: 0,
             hasPermission: false,
             appId: 'q291a124fc151se5b4b890191c65e485',
@@ -919,8 +919,7 @@ export default {
             },
             fourthTabs: [],
             children: [],
-            method: 'wujie',
-            num: 0
+            method: 'wujie'
           },
           {
             badge: true,
@@ -1303,6 +1302,7 @@ export default {
   mounted() {
     this.handleListener();
     this.getNums();
+    window.top.jumpTopMenu = this.handleSelect;
   },
   methods: {
     //获取数量
@@ -2867,7 +2867,7 @@ export default {
       );
     },
     handleSelect(res, method) {
-      // console.log('res:', res);
+      console.log(res, 'resss');
 
       if (method) {
         if (res.urlopenmode == 0) {

package/packages/menu/src/main.vue

@@ -44,7 +44,7 @@ export default {
       type: String,
       default: 'es-icon-application'
     },
-    icons: Object,
+    icons: [Object, Boolean],
     subIcon: {
       type: Boolean,
       default: true