eoss-ui 0.8.7 → 0.8.8

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

@@ -126,7 +126,7 @@
       <el-form-item
         prop="noticeType"
         label="通知方式"
-        v-show="infoList.noticeList.length != 0"
+        v-show="infoList.noticeList.length != 0 && !hideMessage"
       >
         <el-checkbox-group
           v-model="infoList.noticeType"
@@ -213,7 +213,8 @@ export default {
       default: () => {
         return {};
       }
-    }
+    },
+    hideMessage: { type: Boolean, default: false },
   },
   inheritAttrs: false,
   data() {
@@ -733,6 +734,7 @@ export default {
         .then((res) => {
           const { status, message } = res;
           if (status === 'success') {
+            if(this.hideMessage) return;
             this.infoList.noticeType = message.split(',');
             let arr = [];
             this.infoList.noticeList.map((item) => {

package/packages/flow/src/freeStartFlow.vue

@@ -7,6 +7,8 @@
     <Reset
       :type="newTypeCode"
       :appId="resetAppId"
+      :hideMessage="hideMessage"
+      :flowLabelConfig="flowLabelConfig"
       :flowParams="param"
       v-if="newTypeCode == 'reset' || newTypeCode == 'continuation'"
     />
@@ -252,7 +254,11 @@
                 <el-form-item
                   v-if="isNextUser"
                   :prop="isShowNextUser ? 'nextUserId' : 'nextOrgId'"
-                  :label="isShowNextUser ? '下步办理人' : '办理对象'"
+                  :label="
+                    isShowNextUser
+                      ? `${flowLabelConfig.nextUser || '下步办理人'}`
+                      : '办理对象'
+                  "
                 >
                   <SelectUser
                     :nextUser="
@@ -294,7 +300,11 @@
                     :disableds="currentOrgDisabledObjId"
                     @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
                     :types="['department', 'employee']"
-                    :params="{ filid: userModel.orgId,roleid:selectorParams.roleid,only_filid:true }"
+                    :params="{
+                      filid: userModel.orgId,
+                      roleid: selectorParams.roleid,
+                      only_filid: true
+                    }"
                   />
                 </el-form-item>
                 <el-form-item
@@ -306,13 +316,12 @@
                     :nextUser="nextOtherOrgObjSelect"
                     multiple
                     mix
-                    :where="{ filid: 'all',roleid:selectorParams.roleid  }"
+                    :where="{ filid: 'all', roleid: selectorParams.roleid }"
                     :showTooltip="showTooltip"
                     :disableds="otherOrgDisabledObjId"
                     @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
                     :types="['enterprise']"
                     :params="otherParams"
-
                   />
                 </el-form-item>
                 <el-form-item
@@ -425,7 +434,10 @@
             :presetTaskNodeKeyStr="presetTaskNodeKeyStr"
           />
         </el-form>
-        <div v-if="!isFlow && isSpecial" style="padding: 5px; background: #fff">
+        <div
+          v-if="!isFlow && isSpecial && !hideMessage"
+          style="padding: 5px; background: #fff"
+        >
           <div class="news" @click="showNews = !showNews">
             <span class="news-item">消息通知</span>
             <span :class="showNews ? 'show' : 'sj'"></span>
@@ -626,6 +638,8 @@
           :copy-history="pendedHistoryHandle"
           :process-definition-id="nodeInfo.nextNode"
           :opinion="value"
+          :hideMessage="hideMessage"
+          :flowLabelConfig="flowLabelConfig"
           :taskParams="taskParams"
           @cancel="closeProcess($event, 'handleVisible', closeParent)"
         />
@@ -657,6 +671,8 @@
         <ProcessReject
           :pending-id="pendingId"
           :option="value"
+          :hideMessage="hideMessage"
+          :flowLabelConfig="flowLabelConfig"
           :show-reject="showReject"
           :news-info="nextNode.notificationMsg"
           @cancel="closeProcess(true, 'showReject')"
@@ -676,6 +692,8 @@
           :pending-id="pendingId"
           :opinion="value"
           :type="taskReadType"
+          :hideMessage="hideMessage"
+          :flowLabelConfig="flowLabelConfig"
           :taskExamine="taskExamineInfo"
           :news-info="nextNode.notificationMsg"
           @cancel="closeProcess($event, 'showTaskRead')"
@@ -708,6 +726,8 @@
         <SendMsg
           @cancel="closeProcess($event, 'showSendMsg')"
           :pendingId="pendingId"
+          :hideMessage="hideMessage"
+          :flowLabelConfig="flowLabelConfig"
           :newsList="newsList"
         />
       </es-dialog>
@@ -724,6 +744,8 @@
         <TaskUnionExamine
           @cancel="closeProcess($event, 'showTaskUnionExamine')"
           :pendingId="pendingId"
+          :hideMessage="hideMessage"
+          :flowLabelConfig="flowLabelConfig"
           :defaultOpinion="nodeDefaultSubmitOpinion"
           :type="flowType"
           :multiple="flowMultiple"
@@ -743,6 +765,8 @@
         <es-flow
           v-if="showFreeStartFlow"
           isStartFlow
+          :hideMessage="hideMessage"
+          :flowLabelConfig="flowLabelConfig"
           :businessId="freeStartFlowParams.businessId"
           :flowTypeCode="freeStartFlowParams.flowTypeCode"
           :defaultProcessKey="freeStartFlowParams.defaultProcessKey"
@@ -842,11 +866,23 @@ export default {
     userSelectRange: {
       type: String
     },
-    selectorParams: { type: Object, default: () => {return {}} },
+    selectorParams: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
     defaultProcessShowStrategy: { type: String, default: '' },
     taskParams: {
       type: Object,
       default: () => {}
+    },
+    isEndMessage: { type: Boolean, default: false },
+    flowLabelConfig: {
+      type: Object,
+      default: () => {
+        return {};
+      }
     }
   },
   data() {
@@ -865,7 +901,11 @@ export default {
       nextOtherOrgObjSelect: [],
       subProcessColumns: [],
       nextCurrentOrgObjSelect: [],
-      otherParams:{ filid: 'all',roleid:'', nofilid:sessionStorage.getItem('orgId')  },
+      otherParams: {
+        filid: 'all',
+        roleid: '',
+        nofilid: sessionStorage.getItem('orgId')
+      },
       loading: null, // 加载中
       newTypeCode: '',
       NodeName: '', // 当前节点值
@@ -1022,7 +1062,7 @@ export default {
     this.shrink = false;
   },
   mounted() {
-    this.businessIds = this.startFlowBusinessId 
+    this.businessIds = this.startFlowBusinessId;
     this.nextNode.nextNodeId = this.nextNodeId;
     this.otherParams.roleid = this.selectorParams.roleid;
     this.getNodeType();
@@ -1359,7 +1399,7 @@ export default {
           params: {
             ccCode: 'notification_type',
             userId: util.getStorage('userId'),
-            pendingId:this.pendingId
+            pendingId: this.pendingId
           }
         })
         .then((res) => {
@@ -1515,6 +1555,7 @@ export default {
         .then((res) => {
           const { status, message } = res;
           if (status === 'success') {
+            if (this.hideMessage) return;
             this.nextNode.notificationType = message.split(',');
             let arr = [];
             this.newsList.map((item) => {
@@ -2451,9 +2492,9 @@ export default {
       } else {
         this[type] = false;
       }
-      if(this.useScene != 'multiInsMidwayWithSubmitScene'){
+      if (this.useScene != 'multiInsMidwayWithSubmitScene') {
         this.$emit('close');
-        return
+        return;
       }
       if (
         val == 'taskReadAndEnd' ||
@@ -2622,7 +2663,9 @@ export default {
             this.nextNode.nextUserId == '' ||
             (this.multiple && this.nextNode.nextUserId.length == 0)
           ) {
-            this.$message.warning('请选择下步办理人');
+            this.$message.warning(
+              `请选择${this.flowLabelConfig.nextUser || '下步办理人'}`
+            );
             return false;
           }
         } else {