eoss-mobiles 0.3.13 → 0.3.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

package/packages/flow/src/components/Handle.vue

@@ -262,10 +262,12 @@
                   multiple
                   :isAllCheck="isAllCheck"
                   :paddingTop="paddingTop"
+                  isDepartment
                   :objType="'enterprise'"
                   :tabs="'department,myemployee'"
                   :param="{
-                    pid: orgId
+                   department:{pid: orgId,roleid:deptRoleCode} ,
+                   myemployee:{pid: orgId,roleid:deptRoleCode} ,
                   }"
                   :disableds="currentOrgDisabledObjId"
                   :baseUrl="apiBaseUrl"
@@ -497,11 +499,12 @@
               :choiceDeptId="choiceDeptId"
             />
             <!-- 催办通知方式 -->
-            <div class="item-msg item-msg1" v-if="isLimitedTimeHandling">
+            <div class="item-msg item-msg1" v-if="form.isLimitedTime === '1'">
               <Message
                 ref="message"
                 :label="'催办通知方式'"
                 :code="'notification_type'"
+                onlyShowType
                 :baseUrl="baseUrl"
                 @onInputMsg="onInputMsgUrge"
                 :required="true"
@@ -633,6 +636,7 @@ export default {
       currentOrgDisabledObjId: [],
       nextNodeDefault: 0,
       showDefList: false,
+      deptRoleCode:'',
       readOnlyNotificationType: '',
       notificationMessageReadOnly: false,
       freeStartFlowParams: {}, //自由发起流程参数
@@ -1720,6 +1724,7 @@ export default {
       }).then((res) => {
         this.$toast.clear();
         if (res.status == 'success') {
+          _that.deptRoleCode = res.data.nodeExtAttr.deptRoleCode
           _that.enableCustomLimitTimeSetting =
             res.data.nodeExtAttr.enableCustomLimitTimeSetting == 1;
           res.data.otherOrgDisabledObjId &&

package/packages/flow/src/components/Message.vue

@@ -53,6 +53,10 @@ export default {
       type: String,
       default: ''
     },
+    onlyShowType: {
+      type: Boolean,
+      default: false
+    },
     code: {
       type: String,
       default: 'notification_type' // 代码表默认参数
@@ -127,7 +131,7 @@ export default {
   },
   methods: {
     getNoticeType() {
-      console.log(this.defaultNotificationType,'defaultNotificationType')
+      
       if (this.defaultNotificationType) {
         let arr = [];
         this.newList.map((item) => {
@@ -175,6 +179,8 @@ export default {
               this.form.notificationType = arr;
               this.showCheck = true
               this.$emit('onInputMsg', this.form);
+            }else if(this.onlyShowType){
+              this.showCheck = true
             }
           } else {
             this.$toast(message);

package/packages/flow/src/components/StartFlow.vue

@@ -73,6 +73,9 @@
                 pid: pid,
                 onlyMyOrg: false
               }"
+              :disabled="
+                    !isCustomUser || isCurrentNodeForbiddenChangeCandidate == 1
+                  "
               :baseUrl="apiBaseUrl"
               :paddingTop="paddingTop"
               :objType="objType"
@@ -255,6 +258,8 @@ export default {
       showOpinion: true,
       readOnlyNotificationType: '',
       notificationMessageReadOnly: false,
+      isCustomUser:1,
+      isCurrentNodeForbiddenChangeCandidate: 0,
       form: {
         nextNodeId: undefined, // 流程节点id
         nextNodeName: undefined, // 流程节点名称
@@ -614,6 +619,8 @@ export default {
               that.readOnlyNotificationType =
                 res.results.extendData.readOnlyNotificationType;
             }
+            that.isCurrentNodeForbiddenChangeCandidate =
+                res.results.nodeExtr.isCurrentNodeForbiddenChangeCandidate;
             that.processObj = res.results;
             that.nextList = res.results.nodeList;
             that.isOpinionRequired = res.results.nodeExtr.isOpinionRequired;
@@ -674,6 +681,7 @@ export default {
       }).then((res) => {
         this.$toast.clear();
         if (res.rCode == 0) {
+          _that.isCustomUser = res.results.nodeExtr.isCustomUser;
           this.peopleObj = res.results.nodeExtr;
           _that.enableCustomLimitTimeSetting =
             this.peopleObj.enableCustomLimitTimeSetting == 1;

package/packages/selector/src/selector-tree.vue

@@ -24,7 +24,7 @@
       @click="handleClick"
       class="em-flow-tabs"
       type="card"
-      style="margin:10px 0px"
+      style="margin: 10px 0px"
     >
       <em-tab
         :title="item.label"
@@ -153,8 +153,8 @@ export default {
       type: String,
       default: '人'
     },
-    disableds:{
-      type:Array,
+    disableds: {
+      type: Array,
       default: () => []
     },
     showSearch: {
@@ -293,7 +293,7 @@ export default {
       selectData: [],
       timer: null,
       isSearch: false,
-      inputSearch:false,
+      inputSearch: false,
       newParam: {},
       oldIsSearch: false,
       selectIndex: 0,
@@ -582,7 +582,10 @@ export default {
       };
       let copyTabs = this.tabs.split(',');
       let obj = {};
-      copyTabs.map(x => {
+      copyTabs.map((x) => {
+        if(this.param[x]){
+          tabs[x].param = {...tabs[x].param, ...this.param[x]};
+        }
         obj[x];
       });
       if (this.tabs) {
@@ -593,15 +596,12 @@ export default {
         }
       }
       let newtabs = [];
-      console.log(copyTabs,this.param,'copyTabs')
-      copyTabs.map(x => {
-        if(this.param[x]){
-          obj[x].param ={...obj[x].param,...this.param[x]};
-          console.log(this.param[x],'this.param[x]')
+      copyTabs.map((x) => {
+        if (this.param[x]) {
+          obj[x].param = { ...obj[x].param, ...this.param[x] };
         }
         newtabs.push(obj[x]);
       });
-      console.log(newtabs,'newtabs')
       return newtabs;
     }
   },
@@ -619,7 +619,7 @@ export default {
   methods: {
     handleClick(index) {
       this.selectIndex = index;
-      this.inputSearch = false
+      this.inputSearch = false;
       this.getContent();
     },
     getNodeList(isSearch) {
@@ -636,17 +636,17 @@ export default {
       }
       let _this = this;
       if (this.list && this.list.length > 0) {
-        this.list.filter(r => {
-          _this.personnel.find(i => {
+        this.list.filter((r) => {
+          _this.personnel.find((i) => {
             if (i[_this.valueKey] === r[_this.valueKey]) {
               _this.$set(i, 'checked', true);
             } else if (i.children) {
               _this.getActiveChildren(i.children, r[_this.valueKey]);
-            } 
+            }
           });
         });
       } else {
-        _this.personnel.map(x => {
+        _this.personnel.map((x) => {
           if (x.children && x.children.length > 0) {
             this.setChecked(x.children);
           } else {
@@ -657,16 +657,16 @@ export default {
     },
     getActiveChildren(data, id) {
       const _this = this;
-      data.map(x => {
+      data.map((x) => {
         if (x[_this.valueKey] === id) {
           _this.$set(x, 'checked', true);
         } else if (x.children) {
           _this.getActiveChildren(x.children, id);
-        } 
+        }
       });
     },
     setChecked(list) {
-      list.map(x => {
+      list.map((x) => {
         if (x.children && x.children.length > 0) {
           this.setChecked(x.children);
         } else {
@@ -716,7 +716,7 @@ export default {
           this.isSearch = !this.isSearch;
           this.$emit('search', this.namelike);
         } else {
-          this.inputSearch = true
+          this.inputSearch = true;
           this.getContent();
         }
       }, 1000);
@@ -739,17 +739,19 @@ export default {
         overlay: true,
         duration: 0
       });
-      this.newParam = {...JSON.parse(JSON.stringify(this.param))};
-      this.newParam.selecttype = this.newTabs[
-        this.selectIndex
-      ].param.selecttype;
+      this.newParam = { ...JSON.parse(JSON.stringify(this.param)) };
+      this.newParam.selecttype =
+        this.newTabs[this.selectIndex].param.selecttype;
       if (this.newParam.selecttype === 'persongroup') {
         this.newParam.pid = 'root';
         this.newParam.myUserid =
           this.newParam.myUserid || $.getStorage('userId');
       } else {
-        this.newParam.pid =this.newTabs[this.selectIndex].param.pid || this.param.pid || 'root';
+        this.newParam = {...this.newParam,...this.newTabs[this.selectIndex].param}
+        //  this.newTabs[this.selectIndex].param.pid || this.param.pid || 'root';
       }
+      delete this.newParam.department
+      delete this.newParam.myemployee
       request({
         url: this.url
           ? this.url
@@ -763,22 +765,26 @@ export default {
           filid: this.filid,
           ...this.newParam
         }
-      }).then(res => {
+      }).then((res) => {
         this.$toast.clear();
         const { rCode, msg } = res;
         if (rCode == 0) {
-          if(this.inputSearch && !this.namelike){this.inputSearch = false} else if(this.namelike.trim()){
-            this.inputSearch = true
+          if (this.inputSearch && !this.namelike) {
+            this.inputSearch = false;
+          } else if (this.namelike.trim()) {
+            this.inputSearch = true;
           }
           if (typeof this.selectList == 'string') {
             this.selectData = [];
-            this.list = this.getSelectData(JSON.parse(JSON.stringify(res.results)));
+            this.list = this.getSelectData(
+              JSON.parse(JSON.stringify(res.results))
+            );
             this.$emit('update:selectList', this.list);
           }
-          this.personnel =JSON.parse(JSON.stringify(res.results));
+          this.personnel = JSON.parse(JSON.stringify(res.results));
           let _this = this;
-          this.list.filter(r => {
-            _this.personnel.find(i => {
+          this.list.filter((r) => {
+            _this.personnel.find((i) => {
               if (i[_this.valueKey] === r[_this.valueKey]) {
                 _this.$set(i, 'checked', true);
               }
@@ -793,8 +799,8 @@ export default {
     getSelectData(data) {
       const _this = this;
       let user = this.selectList.split(',');
-      user.map(x => {
-        data.map(i => {
+      user.map((x) => {
+        data.map((i) => {
           if (i[_this.valueKey] == x) {
             this.selectData.push(i);
           } else if (i.children) {
@@ -825,7 +831,7 @@ export default {
           ? this.baseUrl + selectObject
           : selectObject,
         params: params
-      }).then(res => {
+      }).then((res) => {
         if (res.rCode == 0) {
           if (
             res.results.length > 0 &&
@@ -843,17 +849,17 @@ export default {
           }
           this.$set(obj, 'children', res.results);
           let _this = this;
-          this.list.filter(r => {
-            obj.children.find(i => {
+          this.list.filter((r) => {
+            obj.children.find((i) => {
               if (i[_this.valueKey] === r[_this.valueKey]) {
                 _this.$set(i, 'checked', true);
               }
             });
           });
-          if (this.isAllCheck && this.multiple && obj.children.length>0) {
+          if (this.isAllCheck && this.multiple && obj.children.length > 0) {
             let checkList = obj.children
               .slice(1, obj.children.length)
-              .filter(x => x.checked);
+              .filter((x) => x.checked);
             if (
               checkList.length ===
               obj.children.slice(1, obj.children.length).length
@@ -881,7 +887,11 @@ export default {
         }
       }
       let newData = res.obj;
-      if ((!newData.children || newData.children.length == 0) && !isStart && data) {
+      if (
+        (!newData.children || newData.children.length == 0) &&
+        !isStart &&
+        data
+      ) {
         if (this.nodeList && this.nodeList.length > 0) {
           this.$toast.loading({
             message: '加载中...',
@@ -892,44 +902,44 @@ export default {
           });
           if (!Array.isArray(data)) {
             data
-              .then(res => {
-                res.map(x => {
+              .then((res) => {
+                res.map((x) => {
                   !x[_that.nodeKey] && _that.$set(x, 'nocheck', false);
                 });
                 _that.$set(newData, 'children', res);
                 if (_that.selectList && _that.selectList.length > 0) {
-                  _that.selectList.filter(r => {
-                    newData.children.find(i => {
+                  _that.selectList.filter((r) => {
+                    newData.children.find((i) => {
                       if (i[_that.valueKey] === r[_that.valueKey]) {
                         _that.$set(i, 'checked', true);
                       }
                     });
                   });
                 } else {
-                  newData.children.find(i => {
+                  newData.children.find((i) => {
                     _that.$set(i, 'checked', false);
                   });
                 }
                 this.$toast.clear();
               })
-              .catch(err => {
+              .catch((err) => {
                 this.$toast('数据返回错误');
               });
           } else {
-            data.map(x => {
+            data.map((x) => {
               !x[_that.nodeKey] && _that.$set(x, 'nocheck', false);
             });
             _that.$set(newData, 'children', data);
             if (_that.selectList && _that.selectList.length > 0) {
-              _that.selectList.filter(r => {
-                newData.children.find(i => {
+              _that.selectList.filter((r) => {
+                newData.children.find((i) => {
                   if (i[_that.valueKey] === r[_that.valueKey]) {
                     _that.$set(i, 'checked', true);
                   }
                 });
               });
             } else {
-              newData.children.find(i => {
+              newData.children.find((i) => {
                 _that.$set(i, 'checked', false);
               });
             }
@@ -948,8 +958,10 @@ export default {
       // debugger
       if (
         this.$listeners['node-click'] &&
-        (this.$listeners['left-icon'] || (this.showMore && !this.isDefaultNode))
-       && !isStart) {
+        (this.$listeners['left-icon'] ||
+          (this.showMore && !this.isDefaultNode)) &&
+        !isStart
+      ) {
         if (this.$listeners['left-icon'] && key === 'node') {
           this.getChiled(res, isStart, 'left-icon');
         } else if (
@@ -999,12 +1011,12 @@ export default {
     },
     checked(res, model) {
       this.oldIsSearch = this.isSearch;
-      if(!res.obj.mixType){
+      if (!res.obj.mixType) {
         this.$set(res.obj, 'mixType', this.newTabs[this.selectIndex].name);
       }
       if (res.obj.checked) {
         if (res.obj.isAllCheck) {
-          model.map(x => {
+          model.map((x) => {
             for (let i in this.list) {
               if (this.list[i][this.valueKey] == x[this.valueKey]) {
                 this.list.splice(i, 1);
@@ -1021,16 +1033,19 @@ export default {
           this.$set(res.obj, 'checked', false);
         }
       } else {
-        
         // if (!this.multiple && this.list.length >= 1) {
         //   this.$toast(this.promptText);
         //   return;
         // }
         if (res.obj.isAllCheck) {
-          model.map(x => {
-            this.$set(x, 'checked', true);
+          let selectData = [];
+          model.map((x) => {
+            if(!x.disabled && !x.nocheck && !x.isAllCheck){
+              this.$set(x, 'checked', true);
+              selectData.push(x);
+            }
           });
-          this.list.push(...model.slice(1, model.length));
+          this.list.push(...selectData);
         } else {
           this.$set(res.obj, 'checked', true);
           if (!this.multiple) {
@@ -1042,21 +1057,25 @@ export default {
         }
       }
       if (this.isAllCheck && this.multiple && model[0].isAllCheck) {
-        let checkList = model.slice(1, model.length).filter(x => x.checked);
+        let checkList = model.slice(1, model.length).filter((x) => x.checked);
         var obj = {};
         this.list = this.list.reduce((item, next) => {
           obj[next.showid] ? '' : (obj[next.showid] = true && item.push(next));
           return item;
         }, []);
         if (model.length - 1 === checkList.length) {
-          this.$set(model[0], 'checked', true);
+          model.map((x) => {
+            if (!x.disabled) {
+              this.$set(model[0], 'checked', true);
+            }
+          });
         } else {
           this.$set(model[0], 'checked', false);
         }
       }
     },
     setChecked(data, item) {
-      data.map(x => {
+      data.map((x) => {
         if (x[this.valueKey] === item[this.valueKey]) {
           this.$set(x, 'checked', true);
         } else {

package/packages/selector/src/tree.vue

@@ -71,7 +71,7 @@
               :class="`iconfont icon-gou select-icon ${isDisabled(item) ? 'disabled' : '' }`"
               v-show="
                 (enterprise ||
-                  (department &&
+                  (selectType == departmentValueKey && 
                     item[departmentLabelKey] == departmentValueKey)) &&
                 !showTree
               "
@@ -82,7 +82,7 @@
               :class="`iconfont icon-quan select-icon ${isDisabled(item) ? 'disabled' : '' }`"
               v-show="
                 (enterprise ||
-                  (department &&
+                  (selectType == departmentValueKey && 
                     item[departmentLabelKey] == departmentValueKey)) &&
                 !showTree
               "
@@ -184,7 +184,7 @@
               item.attr &&
               (!item.nocheck ||
                 enterprise ||
-                (department &&
+                (selectType == departmentValueKey && 
                   item[departmentLabelKey] == departmentValueKey)) &&
               !showTree &&
               inputSearch &&
@@ -197,7 +197,7 @@
             v-if="
               (!item.nocheck ||
                 enterprise ||
-                (department &&
+                (selectType == departmentValueKey && 
                   item[departmentLabelKey] == departmentValueKey)) &&
               !showTree
             "