eoss-ui 0.4.45 → 0.4.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.45",
+  "version": "0.4.46",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/data-table/src/main.vue

@@ -1129,7 +1129,7 @@ export default {
     },
     hanleReset() {
       if (this.url) {
-        this.where = {};
+        this.wheres = {};
         this.getTableData();
       }
       this.$emit('reset');

package/packages/flow/src/main.vue

@@ -3,6 +3,7 @@
     class="es-flow-index"
     :class="{ 'es-flow-narrow': shrink }"
     :style="shrink ? 'width:48px' : ''"
+    v-if="!shrinkAbled"
   >
     <div class="es-flow-top">
       <div class="es-flow-title">
@@ -221,7 +222,9 @@
                   :radioList="radioList"
                   :multiple="multiple"
                   :isCustomUser="!isShowNextUser ? 1 : isCustomUser"
-                  :isCurrentNodeForbiddenChangeCandidate="isCurrentNodeForbiddenChangeCandidate"
+                  :isCurrentNodeForbiddenChangeCandidate="
+                    isCurrentNodeForbiddenChangeCandidate
+                  "
                   :options="options"
                   :mix="multiple"
                   :presetEdit="presetEdit"
@@ -379,7 +382,11 @@
       </div>
       <div
         class="es-user-defined"
-        v-if="nodeInfos.length > 0 || nodeInfo.option.length > 0 || operationList.length>0"
+        v-if="
+          nodeInfos.length > 0 ||
+          nodeInfo.option.length > 0 ||
+          operationList.length > 0
+        "
       >
         <el-button
           v-show="isSubmitButtonShowAgreeAndDisagree != 1"
@@ -633,6 +640,7 @@ export default {
       flowMultiple: true,
       isCustomUser: 0,
       shrink: false,
+      shrinkAbled:false,
       taskExamineInfo: {},
       presetUserJson: [],
       presetList: [],
@@ -683,7 +691,7 @@ export default {
       showTaskUnionExamine: false, //展示联合审核弹窗
       charUrl: util.win.location.origin,
       endFlow: false, // 是否结束流程
-      isCurrentNodeForbiddenChangeCandidate:0,//是否禁止选择办理人
+      isCurrentNodeForbiddenChangeCandidate: 0, //是否禁止选择办理人
       isSubmitButtonShowAgreeAndDisagree: 0, //是否展示同意和不同意按钮
       pointsReadingObj: {
         value: '分阅',
@@ -904,7 +912,6 @@ export default {
       }
     },
     setShrink() {
-      this.shrink = !this.shrink;
       this.$emit('shrink', this.shrink);
     },
     customLoading(type) {
@@ -1649,11 +1656,11 @@ export default {
         .ajax({ url: getHandleInfoHtml, params })
         .then((res) => {
           //pc返回数据
-          const {
-            status,
-            message,
+          
+          this.loading.close();
+          if (res.status === 'success') {
+            const {
             data: {
-              isEndUserTask,
               nextNodeList,
               taskOperations,
               isCustomPreset,
@@ -1678,8 +1685,6 @@ export default {
               taskButtonList
             }
           } = res;
-          this.loading.close();
-          if (status === 'success') {
             this.$emit('startTaskRead', res);
             this.endFlowInfo.choiceOrgId = choiceOrgId;
             this.endFlowInfo.choiceDeptId = choiceDeptId;
@@ -1742,7 +1747,8 @@ export default {
                   this.nodeFixedOpinionSelectList.push({ content: x });
                 });
               }
-              this.isCurrentNodeForbiddenChangeCandidate =  nodeInfoMap.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
+              this.isCurrentNodeForbiddenChangeCandidate =
+                nodeInfoMap.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
               this.nodeDefaultSubmitOpinion =
                 nodeInfoMap.nodeExtAttr.nodeDefaultSubmitOpinion;
               this.isSubmitButtonShowAgreeAndDisagree =
@@ -1773,7 +1779,9 @@ export default {
             this.choiceOrgId = choiceOrgId;
             this.choiceDeptId = choiceDeptId;
             this.pOrgId = pOrgId;
-            this.isEndUserTask = isEndUserTask;
+            if (res.data && res.data.isEndUserTask != undefined) {
+              this.isEndUserTask = res.data.isEndUserTask;
+            }
             if (JSON.stringify(taskExamine) != '{}' && taskExamine) {
               this.nodeInfo.nextNode = taskExamine.processDefinitionId;
               this.NodeName = taskExamine.nodeName;
@@ -1844,7 +1852,12 @@ export default {
             this.getNodeType();
             this.getNodeInfo();
           } else {
-            this.$message.error(message || '系统错误，请联系管理员！');
+            if(res.status === "taskCompleted"){
+              this.shrinkAbled = true
+              this.$message.warning(res.message || '系统错误，请联系管理员！');
+            }else{
+              this.$message.error(res.message || '系统错误，请联系管理员！');
+            }
           }
         })
         .catch((err) => {

package/packages/flow-list/src/flow-table.vue

@@ -8,26 +8,18 @@
         align="center"
         label="经办部门"
         width="150"
+        show-overflow-tooltip
       >
       </el-table-column>
       <el-table-column
         align="center"
         label="步骤"
         width="110"
+        prop="itemname"
         show-overflow-tooltip
       >
-        <template slot-scope="scope"
-          ><span :title="scope.row.itemname">{{
-            scope.row.itemid
-          }}</span></template
-        >
       </el-table-column>
-      <el-table-column align="center" label="办理人" width="110">
-        <template slot-scope="scope"
-          ><span :title="scope.row.userName">{{
-            scope.row.userid
-          }}</span></template
-        >
+      <el-table-column align="center" show-overflow-tooltip prop="userName" label="办理人" width="110">
       </el-table-column>
       <el-table-column
         label="状态"

package/src/index.js

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