eoss-ui 0.4.33 → 0.4.35

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

@@ -7,7 +7,7 @@
       label-width="100px"
     >
       <el-form-item v-if="isSinglePage" prop="opinion" label="意见">
-        <CommonOpinions @change="val => (opinion = val)" />
+        <CommonOpinions @change="(val) => (opinion = val)" />
       </el-form-item>
       <el-form-item
         v-if="isHideCurrentOrg == 0"
@@ -93,13 +93,11 @@
         <span>{{ infoList.noticeInfo }}</span>
       </el-form-item>
       <el-form-item>
-        <div style="text-align:right">
+        <div style="text-align: right">
           <el-button type="primary" size="small" @click="subMit">
             确定
           </el-button>
-          <el-button @click="quit" size="small">
-            取消
-          </el-button>
+          <el-button @click="quit" size="small"> 取消 </el-button>
         </div>
       </el-form-item>
     </el-form>
@@ -181,7 +179,9 @@ export default {
         this.newMultiple = false;
       }
       if (this.type == 'takeAdvice') {
-        this.params.filid = sessionStorage.getItem('orgId');
+        this.params.filid = JSON.parse(
+          sessionStorage.getItem('mainConfig')
+        ).userModel.orgId;
       }
     },
     subTaskReview() {
@@ -210,7 +210,7 @@ export default {
       this.loading = true;
       util
         .ajax(params)
-        .then(res => {
+        .then((res) => {
           const { message, status } = res;
           this.loading = false;
           if (status === 'success') {
@@ -220,7 +220,7 @@ export default {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -234,7 +234,7 @@ export default {
       };
       util
         .ajax(params)
-        .then(res => {
+        .then((res) => {
           const { status, message } = res;
           this.loading = false;
           if (status === 'success') {
@@ -253,7 +253,7 @@ export default {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -277,7 +277,7 @@ export default {
       };
       util
         .ajax(params)
-        .then(res => {
+        .then((res) => {
           const { message, status } = res;
           this.loading = false;
           if (status == 'success') {
@@ -328,7 +328,7 @@ export default {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -363,8 +363,8 @@ export default {
         (type == 'takeAdvice' &&
           (nextCurrentOrgObj == '' ||
             (nextCurrentOrgObj == null && isHideCurrentOrg == 0))) ||
-        ((isHideOtherOrg == 0 && nextOtherOrgObj == '') ||
-          nextOtherOrgObj == null)
+        (isHideOtherOrg == 0 && nextOtherOrgObj == '') ||
+        nextOtherOrgObj == null
       ) {
         return this.$message.warning('请选择处理对象!');
       } else if (
@@ -393,8 +393,12 @@ export default {
         data: {
           opinion,
           pendingId,
-          nextOtherOrgObj: nextOtherOrgObj.join(','),
-          nextCurrentOrgObj: nextCurrentOrgObj.join(','),
+          nextOtherOrgObj: Array.isArray(nextOtherOrgObj)
+            ? nextOtherOrgObj.join(',')
+            : nextOtherOrgObj,
+          nextCurrentOrgObj: Array.isArray(nextCurrentOrgObj)
+            ? nextCurrentOrgObj.join(',')
+            : nextCurrentOrgObj,
           notificationMsg: noticeInfo,
           notificationType: noticeType.join(','),
           choiceDeptId,
@@ -407,7 +411,7 @@ export default {
       this.loading = true;
       util
         .ajax(param)
-        .then(res => {
+        .then((res) => {
           const { message, status } = res;
           this.loading = false;
           if (status == 'success') {
@@ -417,7 +421,7 @@ export default {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -431,13 +435,14 @@ export default {
     changeSelectUser(val, type) {
       const { nextUser, options } = val;
       let newNextUser = '';
-      options.map(item => {
+      options.map((item) => {
         if (newNextUser) {
           newNextUser += `,${item.stype}-${item.id}`;
         } else {
           newNextUser = `${item.stype}-${item.id}`;
         }
       });
+      //console.log(options, newNextUser, 'newNextUser');
       this.infoList[type] = newNextUser;
     },
     getNodeType() {
@@ -446,14 +451,14 @@ export default {
           url: findCodeValues,
           params: { ccCode: 'notification_type' }
         })
-        .then(res => {
+        .then((res) => {
           const { status, data } = res;
           this.loading = false;
           if (status === 'success') {
             this.infoList.noticeList = data;
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -467,13 +472,13 @@ export default {
       };
       util
         .ajax({ url: getNotificationMsg, params, methods: 'post' })
-        .then(res => {
+        .then((res) => {
           if (res.status === 'success') {
             this.infoList.noticeInfo = res.message;
           }
           this.loading = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -485,7 +490,7 @@ export default {
         .ajax({
           url: findSysCodes
         })
-        .then(res => {
+        .then((res) => {
           const { status, message } = res;
           if (status === 'success') {
             this.infoList.noticeType = message.split(',');
@@ -493,7 +498,7 @@ export default {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);

package/packages/flow/src/main.vue

@@ -368,7 +368,7 @@
           >暂存</el-button
         >
       </div>
-      <div class="es-user-defined">
+      <div class="es-user-defined" v-if="nodeInfo.option.length > 0">
         <el-button
           v-show="isSubmitButtonShowAgreeAndDisagree != 1"
           v-for="item of btnList"
@@ -1098,7 +1098,7 @@ export default {
         .ajax({ url: tempSave, params })
         .then((res) => {
           const { status, message } = res;
-         if(!isSave) this.loading.close();
+          if (!isSave) this.loading.close();
           if (status == 'success') {
             // this.$message.success('暂存成功');
             !isSave && this.$emit('save', this.businessIds);
@@ -1107,7 +1107,7 @@ export default {
           }
         })
         .catch((err) => {
-          if(!isSave) this.loading.close();
+          if (!isSave) this.loading.close();
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -1262,6 +1262,7 @@ export default {
         this.flowMultiple = true;
         this.flowDisabled = false;
         this.flowTitle = res.value;
+
         this.toTakeAdvice(res);
       } else if (res.fun === 'toUnionExamine()') {
         //联合审核
@@ -1300,13 +1301,14 @@ export default {
      * @date 2022年9月29日
      **/
     toTakeAdvice(res) {
+      //console.log(res,this.taskExamineInfo,'this.taskExamineInfo')
       let params = {
         url: isCanStartSubFlow,
-        params: {
+        data: {
           appId: this.taskExamineInfo.appId,
           inevitableNode: res.inevitableNode
         },
-        method: 'POST',
+        method: 'post',
         headers: { Accept: 'application/json,text/plain' }
       };
       this.loading = util.loading(this.$loading, '加载中...');
@@ -1373,7 +1375,7 @@ export default {
             url: rejectAndEnd,
             headers: { Accept: 'application/json,text/plain' },
             method: 'post',
-            params: {
+            data: {
               opinion: this.value,
               pendingId: this.pendingId,
               isSinglePage: false
@@ -1890,17 +1892,24 @@ export default {
           const { status, message, data } = res;
           this.loading.close();
           if (status === 'success') {
-            this.nodeInfo.option = data.definitionList;
-            this.nodeInfo.nextNode = data.definitionList.filter(
-              (item) => item.processDefKey == this.defaultProcessKey
-            );
-            if (this.nodeInfo.nextNode.length) {
-              this.nodeInfo.nextNode = this.nodeInfo.nextNode[0].processDefId;
+            if (
+              !Object.keys(data).length ||
+              (data.definitionList && !data.definitionList.length)
+            ) {
+              this.$message.error('流程不存在或未关联对应流程！');
             } else {
-              if (data.definitionList.length == 1) {
-                this.nodeInfo.nextNode = data.definitionList[0].processDefId;
+              this.nodeInfo.option = data.definitionList;
+              this.nodeInfo.nextNode = data.definitionList.filter(
+                (item) => item.processDefKey == this.defaultProcessKey
+              );
+              if (this.nodeInfo.nextNode.length) {
+                this.nodeInfo.nextNode = this.nodeInfo.nextNode[0].processDefId;
               } else {
-                this.nodeInfo.nextNode = '';
+                if (data.definitionList.length == 1) {
+                  this.nodeInfo.nextNode = data.definitionList[0].processDefId;
+                } else {
+                  this.nodeInfo.nextNode = '';
+                }
               }
             }
           } else {
@@ -1974,9 +1983,7 @@ export default {
         }
       });
     },
-    validInfo(){
-      
-    },
+    validInfo() {},
     sendData() {
       this.$refs['nextNode'].validate(async (valid) => {
         if (valid) {

package/packages/handle-user/src/main.vue

@@ -64,7 +64,7 @@ export default {
       deep: true,
       handler(val) {
         if (val) {
-          this.job = val.identityList.filter(item => {
+          this.job = val.identityList.filter((item) => {
             return item.id === val.identityId;
           })[0];
         }
@@ -85,7 +85,7 @@ export default {
         this.job = item;
         util
           .ajax({ url: switchUserTo, params: { userId: item.value } })
-          .then(res => {
+          .then((res) => {
             if (res.rCode == 0) {
               util.setStorage({
                 type: this.storage,
@@ -97,7 +97,7 @@ export default {
                 type: 'success',
                 duration: 500,
                 onClose: () => {
-                  util.removeStorage('mainConfig');
+                  util.removeStorage(['mainConfig', 'jump']);
                   util.win.top.location.reload();
                 }
               });
@@ -109,7 +109,7 @@ export default {
               });
             }
           })
-          .catch(err => {
+          .catch((err) => {
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
             }

package/packages/handler/src/main.vue

@@ -280,7 +280,8 @@ export default {
                   'deviceUnique',
                   'menus',
                   'useCaseCodes',
-                  'mainConfig'
+                  'mainConfig',
+                  'jump'
                 ]);
                 if (this.onQuit && typeof this.onQuit === 'function') {
                   this.onQuit();

package/packages/input/src/main.vue

@@ -81,7 +81,7 @@ export default {
     rule() {
       if (this.rules) {
         if (Array.isArray(this.rules)) {
-          return this.rules.map(item => {
+          return this.rules.map((item) => {
             if (rules[item.type]) {
               return {
                 pattern: rules[item.type]['pattern'],
@@ -127,7 +127,7 @@ export default {
             data: this.param,
             params: this.param
           })
-          .then(res => {
+          .then((res) => {
             if (res.rCode === 0) {
               this.results = JSON.parse(JSON.stringify(res.results));
               let results = query
@@ -136,7 +136,7 @@ export default {
               callback(results);
             }
           })
-          .catch(err => {
+          .catch((err) => {
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
             }
@@ -149,7 +149,7 @@ export default {
       }
     },
     searchFilter(query) {
-      return state => {
+      return (state) => {
         return state.value.toLowerCase().indexOf(query.toLowerCase()) === 0;
       };
     },
@@ -226,7 +226,14 @@ export default {
               { 'es-plain': this.plain }
             ]
           },
-          [this.model || this.text]
+          [
+            this.model == '' ||
+            this.model == null ||
+            this.model == undefined ||
+            this.model == NaN
+              ? this.text
+              : this.model
+          ]
         );
       }
       if (this.$slots.prefix) {

package/packages/main/src/main.vue

@@ -1524,7 +1524,7 @@ export default {
                   this.page = util.handlerUrl(page);
                 } else {
                   this.method = 'wujie';
-                  this.wjName = res.appCode ? res.appCode : 'application';
+                  this.wjName = res && res.appCode ? res.appCode : 'application';
                   this.page = this.host + page;
                   this.$nextTick(() => {
                     this.refresh = true;
@@ -1681,7 +1681,8 @@ export default {
             'deviceUnique',
             'menus',
             'useCaseCodes',
-            'mainConfig'
+            'mainConfig',
+            'jump'
           ]);
           if (util.win.top.location.href.indexOf('main.html') > -1) {
             util.win.top.location.href = './login.html';

package/packages/mainComp/src/main.vue

@@ -1719,7 +1719,7 @@ export default {
                 this.page = util.handlerUrl(page);
               } else {
                 this.method = 'wujie';
-                this.wjName = res.appCode ? res.appCode : 'application';
+                this.wjName = res && res.appCode ? res.appCode : 'application';
                 this.page = page;
                 this.$nextTick(() => {
                   this.refresh = true;
@@ -1873,7 +1873,8 @@ export default {
             'deviceUnique',
             'menus',
             'useCaseCodes',
-            'mainConfig'
+            'mainConfig',
+            'jump'
           ]);
           if (util.win.top.location.href.indexOf('main.html') > -1) {
             util.win.top.location.href = './login.html';

package/packages/tree/src/main.vue

@@ -385,7 +385,7 @@ export default {
           if (res.rCode === 0) {
             this.treeList = JSON.parse(JSON.stringify(res.results));
             if (this.currentFirst) {
-              let currentNode = this.treeList[0].children[0].id;
+              let currentNode = this.treeList[0].id;
               this.$emit('current-first', this.treeList[0]);
               if (!this.currentNodeKey) {
                 this.$nextTick(() => {

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

@@ -438,6 +438,26 @@ export default {
     handleCurrentFirst(res) {
       this.checkeds = res.children[0];
       this.$emit('current-first', res);
+    },
+    setCurrentKey(keys, leafOnly) {
+      let ref =
+        this.tabs && this.tabs.length
+          ? this.tabs[Number(this.active)].ref
+            ? this.tabs[Number(this.active)].ref
+            : 'groupTree' + this.active
+          : 'groupTree';
+      this.$nextTick(() => {
+        this.$refs[ref].setCurrentKey(keys, leafOnly);
+      });
+    },
+    getTree() {
+      let ref =
+        this.tabs && this.tabs.length
+          ? this.tabs[Number(this.active)].ref
+            ? this.tabs[Number(this.active)].ref
+            : 'groupTree' + this.active
+          : 'groupTree';
+      return this.$refs[ref];
     }
   }
 };

package/src/index.js

@@ -115,7 +115,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.33',
+  version: '0.4.35',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -167,7 +167,8 @@ const ajax = function ({
             'menus',
             'menus',
             'useCaseCodes',
-            'mainConfig'
+            'mainConfig',
+            'jump'
           ]);
           if (
             win.top.location.href.indexOf('#/login') === -1 &&