eoss-ui 0.8.7 → 0.8.9

package/packages/flow/src/processReject.vue

@@ -106,7 +106,8 @@ export default {
     newsInfo: { type: String, default: '' },
     showReject: { type: Boolean },
     option: { type: String, default: '' },
-    simpleTips: { type: Boolean, default: true }
+    simpleTips: { type: Boolean, default: true },
+    hideMessage: { type: Boolean, default: false },
   },
   data() {
     return {
@@ -230,6 +231,7 @@ export default {
         .then((res) => {
           const { status, message } = res;
           if (status === 'success') {
+            if(this.hideMessage) return;
             this.nextNode.noticeType = message.split(',');
             let arr = [];
             this.nextNode.noticeList.map((item) => {

package/packages/flow/src/reset.vue

@@ -88,7 +88,7 @@
             nodeInfoExtAttr.nodeType != 2
           "
           :prop="isShowNextUser ? 'nextUser' : 'nextOrgId'"
-          :label="isShowNextUser ? '下步办理人' : '办理对象'"
+          :label="isShowNextUser ? `${flowLabelConfig.nextUser||'下步办理人'}` : '办理对象'"
         >
           <SelectUser
             :nextUser="isShowNextUser ? nextNode.nextUser : nextNode.nextOrgId"
@@ -185,7 +185,7 @@
             v-model="nextItemHandleDescription"
           />
         </el-form-item>
-        <el-form-item v-show="nextNode.noticeList.length != 0" prop="noticeType" label="通知方式">
+        <el-form-item v-show="nextNode.noticeList.length != 0 &&  !hideMessage" prop="noticeType" label="通知方式">
           <el-checkbox-group
             v-if="showNoticeType"
             v-model="nextNode.noticeType"
@@ -274,7 +274,12 @@ export default {
       type: String,
       default: ''
     },
-    type: { type: String }
+    type: { type: String },
+    flowLabelConfig: { 
+      type:Object,
+      default: () => {return {}}
+    },
+    hideMessage: { type: Boolean, default: false },
   },
   data() {
     return {
@@ -554,7 +559,7 @@ export default {
           ) {
             if (this.isShowNextUser) {
               if (nextUser == '' || (this.multiple && nextUser.length == 0)) {
-                return this.$message.warning('请选择下步办理人');
+                return this.$message.warning(`请选择${this.flowLabelConfig.nextUser || '下步办理人'}`);
               }
             } else {
               if (nextOrgId == '' || (this.multiple && nextOrgId.length == 0)) {
@@ -783,6 +788,7 @@ export default {
         .then((res) => {
           const { status, message } = res;
           if (status === 'success') {
+            if(this.hideMessage) return;
             this.nextNode.noticeType = message.split(',');
             let arr = [];
             this.nextNode.noticeList.map((item) => {

package/packages/flow/src/startTaskRead.vue

@@ -115,7 +115,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item
-          v-if="configInfo.isCdjxjTaskHandle != 'true' && noticeList.length > 0"
+          v-if="configInfo.isCdjxjTaskHandle != 'true' && noticeList.length > 0 && !hideMessage"
           prop="noticeType"
           label="通知方式"
         >
@@ -207,7 +207,9 @@ export default {
     readParams: {
       type: [Object, undefined],
       default: undefined
-    }
+    },
+    
+    hideMessage: { type: Boolean, default: false },
   },
   data() {
     return {
@@ -667,6 +669,7 @@ export default {
           const { status, message, data } = res;
           this.loading = false;
           if (status === 'success') {
+            if(this.hideMessage) return;
             this.nextNode.noticeType = message.split(',');
             if (data) {
               this.notificationMessageReadOnly =

package/packages/flow/src/supervise.vue

@@ -26,7 +26,7 @@
           disabled
         />
       </el-form-item>
-      <el-form-item  v-show="nextNode.notificationType.length > 0" prop="noticeType" label="通知方式">
+      <el-form-item  v-show="nextNode.notificationType.length > 0 && !hideMessage" prop="noticeType" label="通知方式">
         <el-checkbox-group v-model="nextNode.noticeType">
           <el-checkbox
             v-for="(item, index) of nextNode.notificationType"
@@ -71,7 +71,8 @@ export default {
       type: String,
       default: ''
     },
-    appId: { type: String, default: '' }
+    appId: { type: String, default: '' },
+    hideMessage: { type: Boolean, default: false },
   },
   data() {
     return {
@@ -87,11 +88,11 @@ export default {
   },
   methods: {
     subProcess() {
-      if (this.nextNode.noticeType.length == 0) {
+      if (this.nextNode.noticeType.length == 0 && !this.hideMessage) {
         this.$message.warning('请选择通知方式');
         return;
       }
-      if (this.nextNode.noticeType.length != 0 && !this.nextNode.notifyMessage) {
+      if (this.nextNode.noticeType.length != 0 && !this.nextNode.notifyMessage && !this.hideMessage) {
         this.$message.warning('请填写通知消息内容');
         return;
       }
@@ -134,15 +135,17 @@ export default {
           this.loading.close();
           if (res.rCode == 0 || res.status == "success") {
             this.nextNode = { ...this.nextNode, ...res.results };
-            let arr = []
-            this.nextNode.noticeType =
-              res.results.defaultNotificationType.split(',');
-              this.nextNode.notificationType.map(x => {
-                if (this.nextNode.noticeType.indexOf(x.cciValue) != -1) {
-                  arr.push(x.cciValue);
-                }
-              })
-              this.nextNode.noticeType = arr
+            if(!this.hideMessage){
+              let arr = []
+              this.nextNode.noticeType =
+                res.results.defaultNotificationType.split(',');
+                this.nextNode.notificationType.map(x => {
+                  if (this.nextNode.noticeType.indexOf(x.cciValue) != -1) {
+                    arr.push(x.cciValue);
+                  }
+                })
+                this.nextNode.noticeType = arr
+            }
           } else {
             this.$message({
               message: res.msg || res.message,

package/packages/flow-group/index.js

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