eoss-ui 0.7.22 → 0.7.23

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

@@ -1,190 +1,190 @@
-<template>
-  <div class="time-limit">
-    <el-form-item prop="isLimitedTime" label="是否限时办理">
-      <el-radio-group v-model="isLimitedTime">
-        <el-radio label="1">是</el-radio>
-        <el-radio label="2">否</el-radio>
-      </el-radio-group>
-    </el-form-item>
-    <div v-show="isLimitedTime == '1'">
-      <el-form-item prop="isLimitedTime" label="限时办理时间">
-        <div  style="display:flex;">
-          <div style="width:48%">
-            <es-input-number
-              v-model="limitedTimeDay"
-              type="number"
-              style="width:80%;margin-right:10px"
-              :controls="false"
-              @change="changeInfo"
-              placeholder="请输入限时天数"
-            />天
-          </div>
-          <div style="width:45%">
-            <es-select
-              style="width:80% !important;margin-right:10px"
-              v-model="limitedTimeHour"
-              placeholder="请选择限时时长"
-              :data="options"
-              @change="changeInfo"
-            />时
-          </div>
-        </div>
-      </el-form-item>
-      <el-form-item prop="isLimitedTime" label="提前通知时间">
-           <div  style="display:flex;">
-          <div style="width:48%">
-            <es-input-number
-              v-model="advanceNoticeDay"
-              type="number"
-              style="width:80%;margin-right:10px"
-              :controls="false"
-              @change="changeInfo"
-              placeholder="请输入提前通知天数"
-            />天
-          </div>
-          <div style="width:45%">
-            <es-select
-              style="width:80% !important;margin-right:10px"
-              v-model="advanceNoticeHour"
-              @change="changeInfo"
-              placeholder="请选择提前通知时长"
-              :data="options"
-            />时
-          </div>
-        </div> </el-form-item>
-      <el-form-item prop="isLimitedTime" label="催办通知方式">
-        <el-checkbox-group v-model="advanceNoticeType" @change="changeInfo">
-          <el-checkbox
-            v-for="item of $attrs.newsList"
-            :key="item.cciValue"
-            :label="item.cciValue"
-          >
-            {{ item.shortName }}
-          </el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'TimeLimit',
-  data() {
-    return {
-      isLimitedTime: '2', //是否限时办理
-        limitedTimeDay: '',
-        limitedTimeHour:'',
-        advanceNoticeDay:'',
-     advanceNoticeHour:'',
-      advanceNoticeType: [], //催办通知方式
-      options: [
-        {
-          value: '0',
-          label: '0'
-        },
-        {
-          value: '1',
-          label: '1'
-        },
-        {
-          value: '2',
-          label: '2'
-        },
-        {
-          value: '3',
-          label: '3'
-        },
-        {
-          value: '4',
-          label: '4'
-        },
-        {
-          value: '5',
-          label: '5'
-        },
-        {
-          value: '6',
-          label: '6'
-        },
-        {
-          value: '7',
-          label: '7'
-        },
-        {
-          value: '8',
-          label: '8'
-        },
-        {
-          value: '9',
-          label: '9'
-        },
-        {
-          value: '10',
-          label: '10'
-        },
-        {
-          value: '11',
-          label: '11'
-        },
-        {
-          value: '12',
-          label: '12'
-        },
-        {
-          value: '13',
-          label: '13'
-        },
-        {
-          value: '14',
-          label: '14'
-        },
-        {
-          value: '15',
-          label: '15'
-        },
-        {
-          value: '16',
-          label: '16'
-        },
-        {
-          value: '17',
-          label: '17'
-        },
-        {
-          value: '18',
-          label: '18'
-        },
-        {
-          value: '19',
-          label: '19'
-        },
-        {
-          value: '20',
-          label: '20'
-        },
-        {
-          value: '21',
-          label: '21'
-        },
-        {
-          value: '22',
-          label: '22'
-        },
-        {
-          value: '23',
-          label: '23'
-        }
-      ]
-    };
-  },
-  methods:{
-    changeInfo(){
-      const {isLimitedTime,limitedTimeDay,limitedTimeHour,advanceNoticeDay,advanceNoticeHour,advanceNoticeType} = this
-      this.$emit('change',{isLimitedTime,limitedTimeDay,limitedTimeHour,advanceNoticeDay,advanceNoticeHour,advanceNoticeType:advanceNoticeType.join(',')})
-    },
-  }
-};
-</script>
-
-<style></style>
+<template>
+  <div class="time-limit">
+    <el-form-item prop="isLimitedTime" label="是否限时办理">
+      <el-radio-group v-model="isLimitedTime">
+        <el-radio label="1">是</el-radio>
+        <el-radio label="2">否</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <div v-show="isLimitedTime == '1'">
+      <el-form-item prop="isLimitedTime" label="限时办理时间">
+        <div  style="display:flex;">
+          <div style="width:48%">
+            <es-input-number
+              v-model="limitedTimeDay"
+              type="number"
+              style="width:80%;margin-right:10px"
+              :controls="false"
+              @change="changeInfo"
+              placeholder="请输入限时天数"
+            />天
+          </div>
+          <div style="width:45%">
+            <es-select
+              style="width:80% !important;margin-right:10px"
+              v-model="limitedTimeHour"
+              placeholder="请选择限时时长"
+              :data="options"
+              @change="changeInfo"
+            />时
+          </div>
+        </div>
+      </el-form-item>
+      <el-form-item prop="isLimitedTime" label="提前通知时间">
+           <div  style="display:flex;">
+          <div style="width:48%">
+            <es-input-number
+              v-model="advanceNoticeDay"
+              type="number"
+              style="width:80%;margin-right:10px"
+              :controls="false"
+              @change="changeInfo"
+              placeholder="请输入提前通知天数"
+            />天
+          </div>
+          <div style="width:45%">
+            <es-select
+              style="width:80% !important;margin-right:10px"
+              v-model="advanceNoticeHour"
+              @change="changeInfo"
+              placeholder="请选择提前通知时长"
+              :data="options"
+            />时
+          </div>
+        </div> </el-form-item>
+      <el-form-item prop="isLimitedTime" label="催办通知方式">
+        <el-checkbox-group v-model="advanceNoticeType" @change="changeInfo">
+          <el-checkbox
+            v-for="item of $attrs.newsList"
+            :key="item.cciValue"
+            :label="item.cciValue"
+          >
+            {{ item.shortName }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TimeLimit',
+  data() {
+    return {
+      isLimitedTime: '2', //是否限时办理
+        limitedTimeDay: '',
+        limitedTimeHour:'',
+        advanceNoticeDay:'',
+     advanceNoticeHour:'',
+      advanceNoticeType: [], //催办通知方式
+      options: [
+        {
+          value: '0',
+          label: '0'
+        },
+        {
+          value: '1',
+          label: '1'
+        },
+        {
+          value: '2',
+          label: '2'
+        },
+        {
+          value: '3',
+          label: '3'
+        },
+        {
+          value: '4',
+          label: '4'
+        },
+        {
+          value: '5',
+          label: '5'
+        },
+        {
+          value: '6',
+          label: '6'
+        },
+        {
+          value: '7',
+          label: '7'
+        },
+        {
+          value: '8',
+          label: '8'
+        },
+        {
+          value: '9',
+          label: '9'
+        },
+        {
+          value: '10',
+          label: '10'
+        },
+        {
+          value: '11',
+          label: '11'
+        },
+        {
+          value: '12',
+          label: '12'
+        },
+        {
+          value: '13',
+          label: '13'
+        },
+        {
+          value: '14',
+          label: '14'
+        },
+        {
+          value: '15',
+          label: '15'
+        },
+        {
+          value: '16',
+          label: '16'
+        },
+        {
+          value: '17',
+          label: '17'
+        },
+        {
+          value: '18',
+          label: '18'
+        },
+        {
+          value: '19',
+          label: '19'
+        },
+        {
+          value: '20',
+          label: '20'
+        },
+        {
+          value: '21',
+          label: '21'
+        },
+        {
+          value: '22',
+          label: '22'
+        },
+        {
+          value: '23',
+          label: '23'
+        }
+      ]
+    };
+  },
+  methods:{
+    changeInfo(){
+      const {isLimitedTime,limitedTimeDay,limitedTimeHour,advanceNoticeDay,advanceNoticeHour,advanceNoticeType} = this
+      this.$emit('change',{isLimitedTime,limitedTimeDay,limitedTimeHour,advanceNoticeDay,advanceNoticeHour,advanceNoticeType:advanceNoticeType.join(',')})
+    },
+  }
+};
+</script>
+
+<style></style>

package/packages/flow/src/form.vue

@@ -1,121 +1,121 @@
-<template>
-  <div class="es-from" v-loading="loading">
-    <el-form
-      ref="dynamicValidateForm"
-      :label-position="labelPosition"
-      :model="newData"
-      :label-width="labelWidth"
-      class="demo-dynamic"
-    >
-      <el-form-item
-        prop="sort"
-        label="排序号"
-        :rules="[{ required: true, message: `请输入排序号`, trigger: 'blur' }]"
-      >
-        <el-input
-          v-model="newData.sort"
-          :placeholder="`请输入入排序号`"
-        ></el-input>
-      </el-form-item>
-      <el-form-item
-        prop="content"
-        label="内容"
-        :rules="[{ required: true, message: `请输入内容`, trigger: 'blur' }]"
-      >
-        <el-input
-          v-model="newData.content"
-          :placeholder="`请输入内容`"
-        ></el-input>
-      </el-form-item>
-      <!-- <el-form-item> -->
-      <!-- </el-form-item> -->
-    </el-form>
-    <div style="text-align: right">
-      <el-button
-        v-show="showSubBtn"
-        type="primary"
-        size="small"
-        @click="submitForm('dynamicValidateForm')"
-      >
-        保存
-      </el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import { addCommonOpion, editCommonOpion } from 'eoss-ui/src/config/api';
-import util from 'eoss-ui/src/utils/util';
-export default {
-  name: 'ideas',
-  componentName: 'ideas',
-  props: {
-    data: {
-      type: Object,
-      default: () => {}
-    },
-    formItemList: {
-      type: Array,
-      default: () => []
-    },
-    labelWidth: {
-      type: String,
-      default: '100px'
-    },
-    showSubBtn: {
-      type: Boolean,
-      default: true
-    },
-    labelPosition: {
-      type: String,
-      default: 'left'
-    }
-  },
-  data() {
-    return {
-      formList: [],
-      loading: false,
-      newData: {},
-      index: 0
-    };
-  },
-  mounted() {
-    this.data.id ? this.add(this.data.id) : this.add();
-  },
-  methods: {
-    add(id) {
-      this.loading = true;
-      util
-        .ajax({
-          url: id ? editCommonOpion : addCommonOpion,
-          params: { id }
-        })
-        .then((res) => {
-          const { status, message, data } = res;
-          if (status == 'success') {
-            this.newData = data.bean;
-          } else {
-            this.$message.error(message || '系统错误，请联系管理员！');
-          }
-          this.loading = false;
-        })
-        .catch((err) => {
-          this.loading = false;
-          if (err.message && err.message !== 'canceled') {
-            this.$message.error(err.message);
-          }
-        });
-    },
-    submitForm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          this.$emit('subMit', { addVisible: false, data: this.newData });
-          this.$emit('sub-mit', { addVisible: false, data: this.newData });
-        } else {
-          return false;
-        }
-      });
-    }
-  }
-};
-</script>
+<template>
+  <div class="es-from" v-loading="loading">
+    <el-form
+      ref="dynamicValidateForm"
+      :label-position="labelPosition"
+      :model="newData"
+      :label-width="labelWidth"
+      class="demo-dynamic"
+    >
+      <el-form-item
+        prop="sort"
+        label="排序号"
+        :rules="[{ required: true, message: `请输入排序号`, trigger: 'blur' }]"
+      >
+        <el-input
+          v-model="newData.sort"
+          :placeholder="`请输入入排序号`"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        prop="content"
+        label="内容"
+        :rules="[{ required: true, message: `请输入内容`, trigger: 'blur' }]"
+      >
+        <el-input
+          v-model="newData.content"
+          :placeholder="`请输入内容`"
+        ></el-input>
+      </el-form-item>
+      <!-- <el-form-item> -->
+      <!-- </el-form-item> -->
+    </el-form>
+    <div style="text-align: right">
+      <el-button
+        v-show="showSubBtn"
+        type="primary"
+        size="small"
+        @click="submitForm('dynamicValidateForm')"
+      >
+        保存
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { addCommonOpion, editCommonOpion } from 'eoss-ui/src/config/api';
+import util from 'eoss-ui/src/utils/util';
+export default {
+  name: 'ideas',
+  componentName: 'ideas',
+  props: {
+    data: {
+      type: Object,
+      default: () => {}
+    },
+    formItemList: {
+      type: Array,
+      default: () => []
+    },
+    labelWidth: {
+      type: String,
+      default: '100px'
+    },
+    showSubBtn: {
+      type: Boolean,
+      default: true
+    },
+    labelPosition: {
+      type: String,
+      default: 'left'
+    }
+  },
+  data() {
+    return {
+      formList: [],
+      loading: false,
+      newData: {},
+      index: 0
+    };
+  },
+  mounted() {
+    this.data.id ? this.add(this.data.id) : this.add();
+  },
+  methods: {
+    add(id) {
+      this.loading = true;
+      util
+        .ajax({
+          url: id ? editCommonOpion : addCommonOpion,
+          params: { id }
+        })
+        .then((res) => {
+          const { status, message, data } = res;
+          if (status == 'success') {
+            this.newData = data.bean;
+          } else {
+            this.$message.error(message || '系统错误，请联系管理员！');
+          }
+          this.loading = false;
+        })
+        .catch((err) => {
+          this.loading = false;
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
+    },
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.$emit('subMit', { addVisible: false, data: this.newData });
+          this.$emit('sub-mit', { addVisible: false, data: this.newData });
+        } else {
+          return false;
+        }
+      });
+    }
+  }
+};
+</script>

package/packages/flow/src/processForm.vue

@@ -144,6 +144,7 @@
             :radioList="radioList"
             :multiple="multiple"
             :isCustomUser="!isShowNextUser ? 1 : isCustomUser"
+            :isCurrentNodeForbiddenChangeCandidate="isCurrentNodeForbiddenChangeCandidate"
             :options="options"
             :presetEdit="presetEdit"
             :mix="multiple"
@@ -483,6 +484,7 @@ export default {
     return {
       loading: false,
       isCustomUser: 0,
+      isCurrentNodeForbiddenChangeCandidate:0,
       allLoading: null,
       selectUser: false,
       multiple: false,
@@ -1050,6 +1052,8 @@ export default {
             this.allLoading.close();
           }
           if (status === 'success') {
+            this.isCurrentNodeForbiddenChangeCandidate =
+              nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
             this.nextNode.userInfo = nextUserList;
             this.countersignaturetypeCode = countersignaturetypeCode;
             this.nextNode.countersignaturetypeText = countersignaturetypeText;