eoss-ui 0.6.18 → 0.6.20

package/packages/flow/src/processForm.vue

@@ -190,7 +190,9 @@
               v-for="item of nextNode.noticeList"
               :key="item.cciValue"
               :label="item.cciValue"
-              :disabled="readOnlyNotificationType.indexOf(item.cciValue) != -1"
+              :disabled="readOnlyNotificationType
+                  ? readOnlyNotificationType.indexOf(item.cciValue) != -1
+                  : false"
             >
               {{ item.shortName }}
             </el-checkbox>
@@ -405,6 +407,7 @@ export default {
     this.getUserInfo();
   },
   mounted() {
+    this.getNodeType();
     this.getStartFlow(this.processDefinitionId);
     this.newOpinion = this.opinion;
   },
@@ -769,6 +772,15 @@ export default {
           const { status, message } = res;
           if (status === 'success') {
             this.nextNode.noticeType = message.split(',');
+            let arr = [];
+            this.nextNode.noticeList.map((item) => {
+              this.nextNode.noticeType.map((x) => {
+                if (x == item.cciValue) {
+                  arr.push(x);
+                }
+              });
+            });
+            this.nextNode.noticeType = arr;
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
@@ -926,7 +938,6 @@ export default {
               this.$refs.customPreset.getPresetFlowInfo(this.nextNode.nextNode);
             this.getFind();
             this.getMessage();
-            this.getNodeType();
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
           }

package/packages/flow/src/processReject.vue

@@ -41,7 +41,9 @@
             v-for="item of nextNode.noticeList"
             :key="item.cciValue"
             :label="item.cciValue"
-            :disabled="readOnlyNotificationType.indexOf(item.cciValue) != -1"
+            :disabled="readOnlyNotificationType
+                  ? readOnlyNotificationType.indexOf(item.cciValue) != -1
+                  : false"
           >
             {{ item.shortName }}
           </el-checkbox>
@@ -130,7 +132,8 @@ export default {
   },
   mounted() {
     this.newsInformation = this.newsInfo;
-    this.getProcessReject();
+      this.getNodeType();
+      this.getProcessReject();
   },
   methods: {
     getNodeType() {
@@ -212,6 +215,15 @@ export default {
           const { status, message } = res;
           if (status === 'success') {
             this.nextNode.noticeType = message.split(',');
+            let arr = [];
+            this.nextNode.noticeList.map((item) => {
+              this.nextNode.noticeType.map((x) => {
+                if (x == item.cciValue) {
+                  arr.push(x);
+                }
+              });
+            });
+            this.nextNode.noticeType = arr;
           }
         })
         .catch((err) => {
@@ -275,7 +287,6 @@ export default {
           }
         });
       this.getFind();
-      this.getNodeType();
     }
   }
 };

package/packages/flow/src/startTaskRead.vue

@@ -12,6 +12,7 @@
       class="demo-dynamic"
       label-width="110px"
     >
+    <div style="max-height: 290px; overflow-y: auto; margin-bottom: 10px">
       <el-form-item
         prop="handleExplain"
         label="当前步骤"
@@ -114,7 +115,9 @@
             v-for="item of noticeList"
             :key="item.cciValue"
             :label="item.cciValue"
-            :disabled="configInfo.readOnlyNotificationType.indexOf(item.cciValue) != -1"
+            :disabled="readOnlyNotificationType
+                  ? readOnlyNotificationType.indexOf(item.cciValue) != -1
+                  : false"
           >
             {{ item.shortName }}
           </el-checkbox>
@@ -123,8 +126,7 @@
       <el-form-item
       v-show="
         nextNode.noticeType.length != 0 &&
-        configInfo.isCdjxjTaskHandle != 'true' &&
-        type == 'transfer'
+        configInfo.isCdjxjTaskHandle != 'true'
       "
         prop="nextNode"
         label="通知消息"
@@ -138,10 +140,11 @@
             "
             type="textarea"
             v-model="newsNoice"
-            :readonly="configInfo.notificationMessageReadOnly =='true'"
+            :readonly="notificationMessageReadOnly =='true'"
           />
         <!-- <span>{{ newsInfo }}</span> -->
       </el-form-item>
+    </div>
       <el-form-item>
         <div style="text-align: right">
           <el-button type="primary" size="small" @click="submit('nextNode')">
@@ -181,6 +184,8 @@ export default {
     return {
       loading: false,
       newsNoice:'',
+      readOnlyNotificationType:'',
+      notificationMessageReadOnly:false,
       nextNode: {
         nextUser: [],
         userInfo: [],
@@ -404,6 +409,15 @@ export default {
           const { status, data } = res;
           if (status === 'success') {
             this.noticeList = data;
+            let arr = [];
+            this.noticeList.map((item) => {
+              this.nextNode.noticeType.map((x) => {
+                if (x == item.cciValue) {
+                  arr.push(x);
+                }
+              });
+            });
+            this.nextNode.noticeType = arr;
           }
         })
         .catch((err) => {
@@ -552,10 +566,14 @@ export default {
           url: findSysCodes
         })
         .then((res) => {
-          const { status, message } = res;
+          const { status, message,data } = res;
           this.loading = false;
           if (status === 'success') {
             this.nextNode.noticeType = message.split(',');
+            if(data){
+              this.notificationMessageReadOnly = data.notificationMessageReadOnly
+              this.readOnlyNotificationType = data.readOnlyNotificationType
+            }
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
           }