eoss-ui 0.7.20 → 0.7.22

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/component/taskUnionExamine.vue

@@ -4,6 +4,7 @@
       ref="infoList"
       :model="infoList"
       class="demo-dynamic"
+      :rules="rules"
       label-width="120px"
     >
       <el-form-item v-if="isSinglePage" prop="opinion" label="意见">
@@ -67,7 +68,7 @@
       >
         <SelectUser
           :nextUser="infoList.nextOtherOrgObj"
-          :where="{ filid: 'other',roleid :selectorParams.roleid }"
+          :where="{ filid: 'other', roleid: selectorParams.roleid }"
           :multiple="newMultiple"
           @change="changeSelectUser($event, 'nextOtherOrgObj')"
           :mix="otherMix"
@@ -83,6 +84,36 @@
           :tabs="foreignOrgTabsParam"
         />
       </el-form-item>
+      <el-form-item
+        v-if="enableCustomLimitTimeSetting"
+        prop="customLimitTime"
+        label="限时办理"
+      >
+        <el-input
+          v-model="infoList.customLimitTime"
+          placeholder="请输入限时办理的天数"
+          class="input-with-select custom-limit-time"
+          >
+          <es-select
+            v-if="!showCustomLimitTimeText"
+            v-model="infoList.customLimitTime"
+            placeholder="请选择"
+            slot="prepend"
+            sysCode="bpm_custom_limit_time"
+          ></es-select>
+          <es-button
+            type="primary"
+            slot="append"
+            @click="
+              () => {
+                infoList.customLimitTime = '';
+                showCustomLimitTimeText = !showCustomLimitTimeText;
+              }
+            "
+            >切换{{ showCustomLimitTimeText ? '选择框' : '文本框' }}</es-button
+          >
+        </el-input>
+      </el-form-item>
       <!-- :rules="[
           { required: false, message: `请选择通知方式`, trigger: 'blur' }
         ]" -->
@@ -170,7 +201,12 @@ export default {
     disabled: { type: Boolean, default: false },
     simpleTips: { type: Boolean, default: true },
     multiple: { type: Boolean, default: true },
-    selectorParams: { type: Object, default: () => {return {}} }
+    selectorParams: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    }
   },
   inheritAttrs: false,
   data() {
@@ -179,14 +215,17 @@ export default {
       readOnlyNotificationType: '',
       notificationMessageReadOnly: false,
       otherMix: false,
+      enableCustomLimitTimeSetting: false,
+      showCustomLimitTimeText: false,
       currentMix: false,
       infoList: {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
         noticeType: [],
-        noticeList:[],
+        noticeList: [],
         noticeInfo: '',
-        opinion: ''
+        opinion: '',
+        customLimitTime: ''
       },
       onlyName: '',
       unionSealData: [],
@@ -212,6 +251,20 @@ export default {
       loading: false
     };
   },
+  computed: {
+    rules() {
+      return {
+        customLimitTime: [
+          {
+            required:this.enableCustomLimitTimeSetting,
+            message: this.showCustomLimitTimeText?'请输入限时办理天数' : '请选择限时办理天数',
+            trigger: 'blur'
+          },
+          {required:this.enableCustomLimitTimeSetting, validator: this.checkCustomLimitTime, trigger: 'change' }
+        ]
+      };
+    }
+  },
   mounted() {
     this.loading = true;
     this.newMultiple = this.multiple;
@@ -222,6 +275,25 @@ export default {
     this.getInfo();
   },
   methods: {
+    validate() {
+      let validSate = true;
+      this.$refs.infoList.validate((valid) => {
+        if (valid) {
+          validSate = true;
+        } else {
+          validSate = false;
+        }
+      });
+      return validSate;
+    },
+    checkCustomLimitTime(rule, value, callback){
+      if (!Number(value) || value.indexOf('.') != -1 || Number(value) < 0) {
+        callback(new Error('请输入正确的天数'))
+        this.infoList.customLimitTime = '';
+      }else{
+        callback()
+      }
+    },
     isMultiple(val) {
       if (val == 7 || val == 9 || val == 11) {
         this.newMultiple = false;
@@ -336,6 +408,8 @@ export default {
                 unionDispatchOrgId,
                 otherOrgDisabledObjId,
                 orgNames,
+                enableCustomLimitTimeSetting,
+                defaultCustomLimitDays,
                 nodeInfoMap: {
                   nodeExtAttr: {
                     userSelectionType,
@@ -349,6 +423,10 @@ export default {
             if (otherOrgDisabledObjId) {
               this.otherOrgDisabledObjId = otherOrgDisabledObjId.split(',');
             }
+            this.enableCustomLimitTimeSetting = enableCustomLimitTimeSetting;
+            if(this.enableCustomLimitTimeSetting &&  defaultCustomLimitDays){
+              this.infoList.customLimitTime = defaultCustomLimitDays + ''
+            }
             if (res.data.customizedConfig) {
               if (res.data.customizedConfig.currentOrgSelectorCustomized) {
                 this.currentMix =
@@ -459,6 +537,7 @@ export default {
           nextCurrentOrgObj,
           nextOtherOrgObj,
           noticeType,
+          customLimitTime,
           noticeInfo
         },
         isOpinionRequired,
@@ -471,18 +550,21 @@ export default {
         isSubFlow,
         pendingId
       } = this;
+      console.log(nextCurrentOrgObj);
+      console.log(nextOtherOrgObj);
       if (
         type == 'takeAdvice' &&
         !nextCurrentOrgObj &&
         isHideCurrentOrg == 0 &&
+        nextCurrentOrgObj.length == 0 &&
         isHideOtherOrg == 0 &&
-        !nextOtherOrgObj
+        (!nextOtherOrgObj || nextOtherOrgObj.length == 0)
       ) {
         return this.$message.warning('请选择处理对象!');
       } else if (
         isHideCurrentOrg == 0 &&
-        !nextOtherOrgObj &&
-        !nextCurrentOrgObj
+        (!nextOtherOrgObj || nextOtherOrgObj.length == 0) &&
+        (!nextCurrentOrgObj || nextCurrentOrgObj.length == 0)
       ) {
         return this.$message.warning('请选择处理对象!');
       }
@@ -506,6 +588,7 @@ export default {
         data: {
           opinion,
           pendingId,
+
           nextOtherOrgObj:
             this.type == 'unionSeal'
               ? this.unionSealData.map((x) => x.showid).join(',')
@@ -524,6 +607,11 @@ export default {
         headers: { Accept: 'application/json,text/plain' },
         method: 'POST'
       };
+      if (this.enableCustomLimitTimeSetting) {
+        param.data.customLimitTime = customLimitTime;
+        console.log(this.validate(),'this.validate()')
+        if (!this.validate()) return;
+      }
       this.loading = true;
       util
         .ajax(param)