eoss-ui 0.6.18 → 0.6.20

package/packages/date-picker/src/main.vue

@@ -1,236 +1,236 @@
-<script>
-import util from 'eoss-ui/src/utils/util';
-const formats = {
-  date: 'yyyy-MM-dd',
-  month: 'yyyy-MM',
-  datetime: 'yyyy-MM-dd HH:mm:ss',
-  time: 'HH:mm:ss',
-  week: 'yyyy年第WW周',
-  timerange: 'HH:mm:ss',
-  daterange: 'yyyy-MM-dd',
-  monthrange: 'yyyy-MM',
-  datetimerange: 'yyyy-MM-dd HH:mm:ss',
-  year: 'yyyy',
-  halfyear: 'bb',
-  quarter: 'qq'
-};
-export default {
-  name: 'EsDatePicker',
-  inheritAttrs: false,
-  inject: {
-    esForm: {
-      default: ''
-    }
-  },
-  props: {
-    value: [String, Array, Number, Date],
-    display: {
-      type: Boolean,
-      default: true
-    },
-    hide: {
-      type: Boolean,
-      default: false
-    },
-    range: {
-      type: Boolean,
-      default: false
-    },
-    // 提交数据时是否转成时间戳
-    timestamp: {
-      type: Boolean,
-      default: false
-    },
-    unlinkPanels: {
-      type: Boolean,
-      default: true
-    },
-    type: {
-      type: String,
-      default: 'date'
-    },
-    rangeSeparator: {
-      type: String,
-      default: '-'
-    },
-    format: String,
-    readonly: Boolean,
-    plain: Boolean,
-    default: Boolean,
-    setFormKeys: Array
-  },
-  data() {
-    return {
-      date: ''
-    };
-  },
-  computed: {
-    models: {
-      get() {
-        return this.value ? this.value : this.dae;
-      },
-      set(val) {
-        return val;
-      }
-    },
-    formats() {
-      return this.format ? this.format : formats[this.dateType];
-    },
-    dateType() {
-      return (this.type === 'datetime' ||
-        this.type === 'dater' ||
-        this.type === 'month') &&
-        this.range
-        ? this.type + 'range'
-        : this.type;
-    },
-    config() {
-      return this.range ||
-        this.type === 'datetimerange' ||
-        this.type === 'daterange' ||
-        this.type === 'monthrange'
-        ? {
-            startPlaceholder: '开始时间',
-            endPlaceholder: '结束时间',
-            unlinkPanels: this.unlinkPanels
-          }
-        : {};
-    },
-    class() {
-      return this.range ||
-        this.type === 'datetimerange' ||
-        this.type === 'daterange' ||
-        this.type === 'monthrange'
-        ? 'es-date-picker-range'
-        : '';
-    }
-  },
-  watch: {
-    models: {
-      deep: true,
-      handler(val) {
-        if (
-          this.setFormKeys &&
-          this.esForm &&
-          this.dateType.indexOf('range') > -1
-        ) {
-          let obj = this.esForm.models;
-          this.setFormKeys.forEach((item, index) => {
-            if (val && val.length) {
-              obj[item] = val[index];
-            } else {
-              delete obj[item];
-            }
-          });
-          this.esForm.models = obj;
-        }
-      }
-    },
-    'esForm.models': {
-      deep: true,
-      handler(val) {
-        if (
-          this.setFormKeys &&
-          this.dateType.indexOf('range') > -1 &&
-          !util.isExist(this.value)
-        ) {
-          this.date = this.setFormKeys.map((item) => {
-            return val[item] || '';
-          });
-        }
-      }
-    }
-  },
-  mounted() {},
-  methods: {
-    getData(val) {
-      if (val) {
-        if (
-          typeof val === 'number' ||
-          (typeof val === 'string' && this.format)
-        ) {
-          return this.dateFormat(val);
-        }
-        if (Array.isArray(val)) {
-          val
-            .map((item) => {
-              if (item) {
-                return typeof item === 'number' ||
-                  (typeof item === 'string' && this.format)
-                  ? this.dateFormat(item)
-                  : item;
-              }
-              return '';
-            })
-            .join(this.rangeSeparator);
-        }
-        return val;
-      }
-      return '';
-    },
-    dateFormat(date) {
-      let newDate = '';
-      switch (this.dateType) {
-        case 'year':
-          newDate = util.formatDate(date, this.formats);
-          break;
-        case 'halfyear':
-          newDate = util.formatDate(date, this.formats);
-          break;
-        case 'month':
-          newDate = util.formatDate(date, this.formats);
-          break;
-        case 'time':
-          newDate = util.formatDate(date, this.formats);
-          break;
-        case 'datetime':
-          newDate = util.formatDate(date, this.formats);
-          break;
-        case 'quarter':
-          newDate = util.formatDate(date, this.formats);
-          break;
-        default:
-          newDate = util.formatDate(date, this.formats);
-      }
-      return newDate;
-    },
-    showPicker() {
-      this.$refs.elDate.showPicker();
-    }
-  },
-  render(h) {
-    if (!this.hide) {
-      if (this.readonly) {
-        return h(
-          'div',
-          { class: ['es-input__inner', { 'es-plain': this.plain }] },
-          [this.getData(this.models)]
-        );
-      }
-      return h('el-date-picker', {
-        class: ['es-date-picker', this.class],
-        attrs: {
-          ...this.$attrs,
-          ...this.config,
-          type: this.dateType,
-          valueFormat: this.timestamp ? 'timestamp' : this.formats,
-          rangeSeparator: this.rangeSeparator,
-          format: this.formats,
-          editable: false,
-          value: this.models
-        },
-        ref: 'elDate',
-        on: this.$listeners,
-        directives: [
-          {
-            name: 'show',
-            value: this.display
-          }
-        ]
-      });
-    } else {
-      return '';
-    }
-  }
-};
-</script>
+<script>
+import util from 'eoss-ui/src/utils/util';
+const formats = {
+  date: 'yyyy-MM-dd',
+  month: 'yyyy-MM',
+  datetime: 'yyyy-MM-dd HH:mm:ss',
+  time: 'HH:mm:ss',
+  week: 'yyyy年第WW周',
+  timerange: 'HH:mm:ss',
+  daterange: 'yyyy-MM-dd',
+  monthrange: 'yyyy-MM',
+  datetimerange: 'yyyy-MM-dd HH:mm:ss',
+  year: 'yyyy',
+  halfyear: 'bb',
+  quarter: 'qq'
+};
+export default {
+  name: 'EsDatePicker',
+  inheritAttrs: false,
+  inject: {
+    esForm: {
+      default: ''
+    }
+  },
+  props: {
+    value: [String, Array, Number, Date],
+    display: {
+      type: Boolean,
+      default: true
+    },
+    hide: {
+      type: Boolean,
+      default: false
+    },
+    range: {
+      type: Boolean,
+      default: false
+    },
+    // 提交数据时是否转成时间戳
+    timestamp: {
+      type: Boolean,
+      default: false
+    },
+    unlinkPanels: {
+      type: Boolean,
+      default: true
+    },
+    type: {
+      type: String,
+      default: 'date'
+    },
+    rangeSeparator: {
+      type: String,
+      default: '-'
+    },
+    format: String,
+    readonly: Boolean,
+    plain: Boolean,
+    default: Boolean,
+    setFormKeys: Array
+  },
+  data() {
+    return {
+      date: ''
+    };
+  },
+  computed: {
+    models: {
+      get() {
+        return this.value ? this.value : this.dae;
+      },
+      set(val) {
+        return val;
+      }
+    },
+    formats() {
+      return this.format ? this.format : formats[this.dateType];
+    },
+    dateType() {
+      return (this.type === 'datetime' ||
+        this.type === 'dater' ||
+        this.type === 'month') &&
+        this.range
+        ? this.type + 'range'
+        : this.type;
+    },
+    config() {
+      return this.range ||
+        this.type === 'datetimerange' ||
+        this.type === 'daterange' ||
+        this.type === 'monthrange'
+        ? {
+            startPlaceholder: '开始时间',
+            endPlaceholder: '结束时间',
+            unlinkPanels: this.unlinkPanels
+          }
+        : {};
+    },
+    class() {
+      return this.range ||
+        this.type === 'datetimerange' ||
+        this.type === 'daterange' ||
+        this.type === 'monthrange'
+        ? 'es-date-picker-range'
+        : '';
+    }
+  },
+  watch: {
+    models: {
+      deep: true,
+      handler(val) {
+        if (
+          this.setFormKeys &&
+          this.esForm &&
+          this.dateType.indexOf('range') > -1
+        ) {
+          let obj = this.esForm.models;
+          this.setFormKeys.forEach((item, index) => {
+            if (val && val.length) {
+              obj[item] = val[index];
+            } else {
+              delete obj[item];
+            }
+          });
+          this.esForm.models = obj;
+        }
+      }
+    },
+    'esForm.models': {
+      deep: true,
+      handler(val) {
+        if (
+          this.setFormKeys &&
+          this.dateType.indexOf('range') > -1 &&
+          !util.isExist(this.value)
+        ) {
+          this.date = this.setFormKeys.map((item) => {
+            return val[item] || '';
+          });
+        }
+      }
+    }
+  },
+  mounted() {},
+  methods: {
+    getData(val) {
+      if (val) {
+        if (
+          typeof val === 'number' ||
+          (typeof val === 'string' && this.format)
+        ) {
+          return this.dateFormat(val);
+        }
+        if (Array.isArray(val)) {
+          val
+            .map((item) => {
+              if (item) {
+                return typeof item === 'number' ||
+                  (typeof item === 'string' && this.format)
+                  ? this.dateFormat(item)
+                  : item;
+              }
+              return '';
+            })
+            .join(this.rangeSeparator);
+        }
+        return val;
+      }
+      return '';
+    },
+    dateFormat(date) {
+      let newDate = '';
+      switch (this.dateType) {
+        case 'year':
+          newDate = util.formatDate(date, this.formats);
+          break;
+        case 'halfyear':
+          newDate = util.formatDate(date, this.formats);
+          break;
+        case 'month':
+          newDate = util.formatDate(date, this.formats);
+          break;
+        case 'time':
+          newDate = util.formatDate(date, this.formats);
+          break;
+        case 'datetime':
+          newDate = util.formatDate(date, this.formats);
+          break;
+        case 'quarter':
+          newDate = util.formatDate(date, this.formats);
+          break;
+        default:
+          newDate = util.formatDate(date, this.formats);
+      }
+      return newDate;
+    },
+    showPicker() {
+      this.$refs.elDate.showPicker();
+    }
+  },
+  render(h) {
+    if (!this.hide) {
+      if (this.readonly) {
+        return h(
+          'div',
+          { class: ['es-input__inner', { 'es-plain': this.plain }] },
+          [this.getData(this.models)]
+        );
+      }
+      return h('el-date-picker', {
+        class: ['es-date-picker', this.class],
+        attrs: {
+          ...this.$attrs,
+          ...this.config,
+          type: this.dateType,
+          valueFormat: this.timestamp ? 'timestamp' : this.formats,
+          rangeSeparator: this.rangeSeparator,
+          format: this.formats,
+          editable: false,
+          value: this.models
+        },
+        ref: 'elDate',
+        on: this.$listeners,
+        directives: [
+          {
+            name: 'show',
+            value: this.display
+          }
+        ]
+      });
+    } else {
+      return '';
+    }
+  }
+};
+</script>

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

@@ -222,7 +222,7 @@ export default {
       isNoStart && (this.newPresetList = []);
       let params = {
         url: getPresetCustomInfo,
-        params: {
+        data: {
           nodeId: nodeId,
           processDefinitionId: processDefinitionId
             ? processDefinitionId

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

@@ -135,7 +135,7 @@ export default {
         this;
       let params = {
         url: getPresetNodeInfo,
-        params: {
+        data: {
           nextNodeId,
           processDefinitionId,
           businessId,

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

@@ -21,7 +21,9 @@
             v-for="item of notificationList"
             :key="item.cciValue"
             :label="item.cciValue"
-            :disabled="readOnlyNotificationType.indexOf(item.cciValue) != -1"
+            :disabled="readOnlyNotificationType
+                  ? readOnlyNotificationType.indexOf(item.cciValue) != -1
+                  : false"
           >
             {{ item.shortName }}
           </el-checkbox>

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

@@ -75,12 +75,17 @@
           { required: false, message: `请选择通知方式`, trigger: 'blur' }
         ]"
       >
-        <el-checkbox-group v-model="infoList.noticeType" style="display:contents">
+        <el-checkbox-group
+          v-model="infoList.noticeType"
+          style="display: contents"
+        >
           <el-checkbox
             v-for="item of infoList.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>
@@ -91,17 +96,17 @@
         prop="noticeInfo"
         label="通知消息"
       >
-      <es-input
-            style="
-              border-color: #ccc;
-              padding: 5px;
-              border-radius: 5px;
-              font-size: 13px;
-            "
-            type="textarea"
-            v-model="infoList.noticeInfo"
-            :readonly="notificationMessageReadOnly"
-          />
+        <es-input
+          style="
+            border-color: #ccc;
+            padding: 5px;
+            border-radius: 5px;
+            font-size: 13px;
+          "
+          type="textarea"
+          v-model="infoList.noticeInfo"
+          :readonly="notificationMessageReadOnly"
+        />
         <!-- <span>{{ infoList.noticeInfo }}</span> -->
       </el-form-item>
       <el-form-item>
@@ -154,8 +159,8 @@ export default {
   data() {
     return {
       opinion: '', //办理意见
-      readOnlyNotificationType:'',
-      notificationMessageReadOnly:false,
+      readOnlyNotificationType: '',
+      notificationMessageReadOnly: false,
       infoList: {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
@@ -184,6 +189,7 @@ export default {
   mounted() {
     this.loading = true;
     this.newMultiple = this.multiple;
+    this.getNodeType();
     if (this.type === 'taskReview') return this.getTaskReview();
     this.getInfo();
   },
@@ -262,7 +268,6 @@ export default {
             this.currentOrgProcessKey = taskExamine.currentOrgProcessKey;
             this.getFind();
             this.getMessage();
-            this.getNodeType();
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
@@ -315,8 +320,9 @@ export default {
                 }
               }
             } = res;
-            this.readOnlyNotificationType = readOnlyNotificationType
-            this.notificationMessageReadOnly = notificationMessageReadOnly == 'true'
+            this.readOnlyNotificationType = readOnlyNotificationType;
+            this.notificationMessageReadOnly =
+              notificationMessageReadOnly == 'true';
             this.isSinglePage = taskExamine.isSinglePage;
             this.isSubFlow = taskExamine.isSubFlow;
             this.opinion = taskExamine.opinion;
@@ -341,7 +347,6 @@ export default {
             this.isMultiple(userSelectionType);
             this.getFind();
             this.getMessage();
-            this.getNodeType();
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
@@ -466,13 +471,17 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
+          params: {
+            ccCode: 'notification_type',
+            userId: util.getStorage('userId')
+          }
         })
         .then((res) => {
           const { status, data } = res;
           this.loading = false;
           if (status === 'success') {
             this.infoList.noticeList = data;
+            
           }
         })
         .catch((err) => {
@@ -511,6 +520,15 @@ export default {
           const { status, message } = res;
           if (status === 'success') {
             this.infoList.noticeType = message.split(',');
+            let arr = [];
+            this.infoList.noticeList.map((item) => {
+              this.infoList.noticeType.map((x) => {
+                if (x == item.cciValue) {
+                  arr.push(x);
+                }
+              });
+            });
+            this.infoList.noticeType = arr;
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
           }