eoss-ui 0.7.19 → 0.7.21

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,13 +215,17 @@ export default {
       readOnlyNotificationType: '',
       notificationMessageReadOnly: false,
       otherMix: false,
+      enableCustomLimitTimeSetting: false,
+      showCustomLimitTimeText: false,
       currentMix: false,
       infoList: {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
         noticeType: [],
+        noticeList: [],
         noticeInfo: '',
-        opinion: ''
+        opinion: '',
+        customLimitTime: ''
       },
       onlyName: '',
       unionSealData: [],
@@ -211,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;
@@ -221,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;
@@ -335,6 +408,8 @@ export default {
                 unionDispatchOrgId,
                 otherOrgDisabledObjId,
                 orgNames,
+                enableCustomLimitTimeSetting,
+                defaultCustomLimitDays,
                 nodeInfoMap: {
                   nodeExtAttr: {
                     userSelectionType,
@@ -348,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 =
@@ -458,6 +537,7 @@ export default {
           nextCurrentOrgObj,
           nextOtherOrgObj,
           noticeType,
+          customLimitTime,
           noticeInfo
         },
         isOpinionRequired,
@@ -470,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('请选择处理对象!');
       }
@@ -505,6 +588,7 @@ export default {
         data: {
           opinion,
           pendingId,
+
           nextOtherOrgObj:
             this.type == 'unionSeal'
               ? this.unionSealData.map((x) => x.showid).join(',')
@@ -523,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)

package/packages/flow/src/main.vue

@@ -129,7 +129,7 @@
       :appId="resetAppId"
       :params="param"
       :showOther="showOther"
-          :selectorParams="selectorParams"
+      :selectorParams="selectorParams"
       :formLabelPosition="formLabelPosition"
       :simpleTips="simpleTips"
     />
@@ -245,6 +245,7 @@
           ref="nextNode"
           :model="isFlow ? nodeInfo : nextNode"
           class="demo-dynamic"
+          :rules="rules"
           :label-width="
             startFlowPageEmbeddedIntoStartFlowIndex ? '100px' : '120px'
           "
@@ -483,40 +484,7 @@
                     :tabs="nextUserTabs"
                   />
                 </el-form-item>
-                <el-form-item
-                  v-if="enableCustomLimitTimeSetting"
-                  prop="customLimitTime"
-                  label="限时办理"
-                >
-                  <el-input
-                    v-model="nextNode.customLimitTime"
-                    placeholder="请输入限时办理的天数"
-                    @change="changeCustomLimitTime"
-                    class="input-with-select custom-limit-time"
-                  >
-                    <es-select
-                      v-if="!showCustomLimitTimeText"
-                      v-model="nextNode.customLimitTime"
-                      placeholder="请选择"
-                      slot="prepend"
-                      sysCode="bpm_custom_limit_time"
-                    ></es-select>
-                    <es-button
-                      type="primary"
-                      slot="append"
-                      @click="
-                        () => {
-                          nextNode.customLimitTime = '';
-                          showCustomLimitTimeText = !showCustomLimitTimeText;
-                        }
-                      "
-                      >切换{{
-                        showCustomLimitTimeText ? '选择框' : '文本框'
-                      }}</es-button
-                    >
-                  </el-input>
-                </el-form-item>
-
+               
                 <el-form-item
                   v-if="isHideCurrentOrg && nextNode.isReturnSubmitter != 1"
                   prop="nextCurrentOrgObj"
@@ -610,6 +578,41 @@
                     :tabs="tabs"
                   />
                 </el-form-item>
+                 <el-form-item
+                  v-if="enableCustomLimitTimeSetting"
+                  prop="customLimitTime"
+                  label="限时办理"
+                  style="margin-bottom: 10px"
+                >
+                  <el-input
+                    v-model="nextNode.customLimitTime"
+                    placeholder="请输入限时办理的天数"
+                    @change="changeCustomLimitTime"
+                    class="input-with-select custom-limit-time"
+                  >
+                    <es-select
+                      v-if="!showCustomLimitTimeText"
+                      v-model="nextNode.customLimitTime"
+                      placeholder="请选择"
+                      slot="prepend"
+                      sysCode="bpm_custom_limit_time"
+                    ></es-select>
+                    <es-button
+                      type="primary"
+                      slot="append"
+                      @click="
+                        () => {
+                          nextNode.customLimitTime = '';
+                          showCustomLimitTimeText = !showCustomLimitTimeText;
+                        }
+                      "
+                      >切换{{
+                        showCustomLimitTimeText ? '选择框' : '文本框'
+                      }}</es-button
+                    >
+                  </el-input>
+                </el-form-item>
+
                 <el-form-item
                   v-if="isHandleExplain == 1"
                   prop="handleExplain"
@@ -1239,7 +1242,12 @@ export default {
       type: Object,
       default: () => {}
     },
-    selectorParams: { type: Object, default: () => {return {}} },
+    selectorParams: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
     width: {
       type: String
     },
@@ -1467,8 +1475,8 @@ export default {
     this.currentOrgSelectorParams.filid = JSON.parse(
       util.getStorage('mainConfig')
     ).userModel.orgId;
-    this.foreignOrgSelectorParams.roleid = this.currentOrgSelectorParams.roleid =
-      this.selectorParams.roleid;
+    this.foreignOrgSelectorParams.roleid =
+      this.currentOrgSelectorParams.roleid = this.selectorParams.roleid;
     this.nextNode.nextNodeId = this.nextNodeId;
     if (!this.isFlow) {
       this.getInfo();
@@ -1545,6 +1553,18 @@ export default {
     }
   },
   computed: {
+    rules() {
+      return {
+        customLimitTime: [
+          {
+            required:this.enableCustomLimitTimeSetting,
+            message: this.showCustomLimitTimeText?'请输入限时办理天数' : '请选择限时办理天数',
+            trigger: 'blur'
+          },
+          {required:this.enableCustomLimitTimeSetting, validator: this.checkCustomLimitTime, trigger: 'change' }
+        ]
+      };
+    },
     tabs() {
       return {
         employee: {
@@ -1586,6 +1606,25 @@ export default {
     }
   },
   methods: {
+       limitTimevalidate() {
+      let validSate = true;
+      this.$refs.nextNode.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.nextNode.customLimitTime = '';
+      }else{
+        callback()
+      }
+    },
     getAdminMsgType() {
       let params = {
         url: getUrgencyLevelChangedNotificationType,
@@ -1675,7 +1714,7 @@ export default {
           //   });
           // }
           this.optionsKey++;
-          this.isOpinionRequired = res.data.nodeExtAttr.isOpinionRequired == 1;
+          this.isOpinionRequired = res.data.nodeExtAttr.isOpinionRequired;
           this.showOpinion = false;
           setTimeout(() => {
             this.showOpinion = true;
@@ -2590,6 +2629,9 @@ export default {
               data.nodeExtAttr.currentNodeEnableItemHandleDescription == 1;
             this.enableCustomLimitTimeSetting =
               data.nodeExtAttr.enableCustomLimitTimeSetting == 1;
+            if(this.enableCustomLimitTimeSetting && data.nodeMoreInfo.defaultCustomLimitDays){
+              this.nextNode.customLimitTime = data.nodeMoreInfo.defaultCustomLimitDays + ''
+            }
             data.otherOrgDisabledObjId &&
               (this.otherOrgDisabledObjId =
                 data.otherOrgDisabledObjId.split(','));
@@ -3082,7 +3124,6 @@ export default {
               }
               this.isCurrentNodeForbiddenChangeCandidate =
                 nodeInfoMap.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
-              console.log(opinion,'opinionopinionopinion')
               this.value = opinion || '';
               this.nodeDefaultSubmitOpinion =
                 nodeInfoMap.nodeExtAttr.nodeDefaultSubmitOpinion;

package/packages/flow/src/processForm.vue

@@ -11,6 +11,7 @@
       :model="nextNode"
       class="demo-dynamic"
       label-width="100px"
+      :rules="rules"
       :label-position="labelPosition"
     >
       <div
@@ -76,7 +77,7 @@
           prop="nextNode"
           label="下步节点"
           :rules="[
-            { required: true, message: `请选择下步节点`, trigger: 'blur' }
+            { required: false, message: `请选择下步节点`, trigger: 'blur' }
           ]"
         >
           <el-select
@@ -209,12 +210,26 @@
           v-if="enableCustomLimitTimeSetting"
           prop="customLimitTime"
           label="限时办理"
+          :rules="[
+            {
+              required: enableCustomLimitTimeSetting,
+              message: showCustomLimitTimeText
+                ? '请输入限时办理天数'
+                : '请选择限时办理天数',
+              trigger: 'blur'
+            },
+            {
+              required: enableCustomLimitTimeSetting,
+              validator: checkCustomLimitTime,
+              trigger: 'blur'
+            }
+          ]"
         >
           <el-input
             v-model="nextNode.customLimitTime"
             placeholder="请输入限时办理的天数"
-            @change="changeCustomLimitTime"
             class="input-with-select custom-limit-time"
+            @change="changeCustomLimitTime"
           >
             <es-select
               v-if="!showCustomLimitTimeText"
@@ -248,7 +263,11 @@
             v-model="nextNode.handleExplain"
           />
         </el-form-item>
-        <el-form-item prop="noticeType" label="通知方式" v-show="showBtn && nextNode.noticeList.length>0">
+        <el-form-item
+          prop="noticeType"
+          label="通知方式"
+          v-show="showBtn && nextNode.noticeList.length > 0"
+        >
           <el-checkbox-group v-model="nextNode.noticeType">
             <el-checkbox
               v-for="item of nextNode.noticeList"
@@ -327,7 +346,10 @@
         </div>
       </el-form-item>
     </el-form>
-    <div v-if="!showBtn && nextNode.noticeList.length>0" style="padding: 5px; background: #fff">
+    <div
+      v-if="!showBtn && nextNode.noticeList.length > 0"
+      style="padding: 5px; background: #fff"
+    >
       <div class="news" @click="showNews = !showNews">
         <span class="news-item">消息通知</span>
         <span :class="showNews ? 'show' : 'sj'"></span>
@@ -444,18 +466,18 @@ export default {
       default: ''
     },
     showBtn: { type: Boolean, default: true },
-    messageType:{
-      type:Array,
+    messageType: {
+      type: Array,
       default: () => []
     },
-    urgencyLevel:{
-      type:[Number,String],
-      default:''
-    },
-    keyCount:{
-      type:[Number,String],
-      default:0
+    urgencyLevel: {
+      type: [Number, String],
+      default: ''
     },
+    keyCount: {
+      type: [Number, String],
+      default: 0
+    }
   },
   data() {
     return {
@@ -547,12 +569,12 @@ export default {
         userInfo: [],
         handleExplain: '',
         noticeList: [],
-        msgTypeCount:0
+        msgTypeCount: 0
       }
     };
   },
   watch: {
-    messageType:{
+    messageType: {
       handler(val) {
         if (this.urgencyLevel) {
           this.nextNode.noticeList = val;
@@ -565,8 +587,8 @@ export default {
             });
           });
           this.nextNode.noticeType = arr;
-        }else{
-          this.msgTypeCount++
+        } else {
+          this.msgTypeCount++;
         }
       }
     },
@@ -596,6 +618,24 @@ export default {
     }
   },
   computed: {
+    rules() {
+      return {
+        customLimitTime: [
+          {
+            required: this.enableCustomLimitTimeSetting,
+            message: this.showCustomLimitTimeText
+              ? '请输入限时办理天数'
+              : '请选择限时办理天数',
+            trigger: 'blur'
+          },
+          {
+            required: this.enableCustomLimitTimeSetting,
+            validator: this.checkCustomLimitTime,
+            trigger: 'blur'
+          }
+        ]
+      };
+    },
     types() {
       if (this.isCdjxjTaskHandle == 'true') {
         return ['employee', 'enterprise', 'department'];
@@ -608,7 +648,7 @@ export default {
     this.getUserInfo();
   },
   mounted() {
-    if(!this.urgencyLevel){
+    if (!this.urgencyLevel) {
       this.getNodeType();
     }
     this.getStartFlow(this.processDefinitionId);
@@ -619,8 +659,27 @@ export default {
     }
   },
   methods: {
+    limitTimevalidate() {
+      let validSate = true;
+      this.$refs.nextNode.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.nextNode.customLimitTime = '';
+      } else {
+        callback();
+      }
+    },
     handleChange() {
-      this.isChangeMessage = true
+      this.isChangeMessage = true;
     },
     changeCustomLimitTime(val) {
       if (!Number(val) || val.indexOf('.') != -1 || Number(val) < 0) {
@@ -783,7 +842,10 @@ export default {
           if (res.status === 'success') {
             if (!this.showBtn) {
               this.oldMessage = res.message;
-              this.nextNode.noticeInfo = res.message.replace('{title}', this.formTitle);
+              this.nextNode.noticeInfo = res.message.replace(
+                '{title}',
+                this.formTitle
+              );
             } else {
               this.nextNode.noticeInfo = res.message;
             }
@@ -847,7 +909,6 @@ export default {
           let params = {
             processDefinitionId: this.processDefinitionId,
             nextUserId: this.multiple ? newNextUser.join(',') : nextUser,
-            customLimitTime,
             nextNodeId: nextNode,
             businessId: this.businessId,
             notificationType: newNoticeType,
@@ -870,6 +931,22 @@ export default {
                 : presetReadUserId.join(','),
             opinion: this.newOpinion || newOpinion
           };
+          if (this.enableCustomLimitTimeSetting) {
+            params.customLimitTime = customLimitTime;
+            if (!customLimitTime) {
+              this.$message.warning('请选择或输入限时办理的天数');
+              this.nextNode.customLimitTime = '';
+              return;
+            } else if (
+              !Number(customLimitTime) ||
+              val.indexOf('.') != -1 ||
+              Number(customLimitTime) < 0
+            ) {
+              this.$message.warning('请输入正确的天数');
+              this.nextNode.customLimitTime = '';
+              return;
+            }
+          }
           if (this.activeNames != '1') delete params.customPresetUserJson;
           if (this.isFreeStartFlow || this.formType === 'readTransfer') {
             let newParm = {};
@@ -890,7 +967,7 @@ export default {
                     : '';
               }
             }
-            
+
             newParm.submitTaskParamJson = JSON.stringify(this.taskParams);
             if (this.formType == 'readTransfer') {
               newParm.readTransferHandleStartFlowParamJson =
@@ -902,17 +979,19 @@ export default {
             }
             params = newParm;
           }
-          if(this.copyHistory && !this.isFreeStartFlow){
-              params.pendingId = this.pendingId
-              delete params.businessId;
-            }
+          if (this.copyHistory && !this.isFreeStartFlow) {
+            params.pendingId = this.pendingId;
+            delete params.businessId;
+          }
           util
             .ajax({
               url: this.isFreeStartFlow
                 ? freeStartFlowWithSubmitTask
                 : this.formType == 'readTransfer'
                 ? startReadTransferHandleFlowWithTaskReadEnd
-                : this.copyHistory? freeStartFlow : register,
+                : this.copyHistory
+                ? freeStartFlow
+                : register,
               method: 'post',
               data: params
             })

package/packages/handler/src/main.vue

@@ -365,7 +365,6 @@ export default {
       return len;
     },
     handleClick(res) {
-      console.log(res);
       const { type, event } = res;
       if (event) {
         event();