eoss-ui 0.6.78 → 0.6.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.78",
+  "version": "0.6.80",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/flow/src/main.vue

@@ -6,7 +6,7 @@
     v-if="!shrinkAbled"
   >
     <div
-      v-if="showCirculate"
+      v-if="showCirculate && newTypeCode != 'fenyue'"
       style="height: 100%; display: flex; flex-direction: column"
     >
       <div class="es-flow-top">
@@ -49,7 +49,7 @@
         :isBanInputOpinion="isBanInputOpinion"
         :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
       />
-      <div :class="`es-info ${formLabelPosition == 'left'?'form-left':''}`" >
+      <div :class="`es-info ${formLabelPosition == 'left' ? 'form-left' : ''}`">
         <el-form
           ref="form"
           :model="circulateForm"
@@ -219,17 +219,19 @@
           !shrink
         "
         ref="esContent"
-        :class="`es-info ${formLabelPosition == 'left'?'form-left':''}`"
+        :class="`es-info ${formLabelPosition == 'left' ? 'form-left' : ''}`"
       >
         <el-form
           ref="nextNode"
           :model="isFlow ? nodeInfo : nextNode"
           class="demo-dynamic"
-          :label-width="startFlowPageEmbeddedIntoStartFlowIndex?'100px' : '120px'"
+          :label-width="
+            startFlowPageEmbeddedIntoStartFlowIndex ? '100px' : '120px'
+          "
           :label-position="formLabelPosition"
         >
           <el-form-item
-            v-if="isFlow && nodeInfo.option.length > 0"
+            v-if="isFlow && nodeInfo.option.length > 0 && !flowListDisabled"
             prop="nextNode"
             label="选择流程"
             :rules="[
@@ -253,7 +255,7 @@
                   v-for="items in nodeInfo.option"
                   :key="items.id"
                   :label="items.name"
-                  :disabled="flowListDisabled || items.disabled"
+                  :disabled="items.disabled"
                   :value="items.processDefId"
                 ></el-option>
               </el-select>
@@ -655,7 +657,8 @@
           v-if="
             isFlow &&
             nodeInfo.nextNode &&
-            startFlowPageEmbeddedIntoStartFlowIndex && !directCreateCircularReadWhenFlowStarted
+            startFlowPageEmbeddedIntoStartFlowIndex &&
+            !directCreateCircularReadWhenFlowStarted
           "
           ref="processFormIndex"
           :id="freeStartFlowParams.startFlowBusinessId || businessIds"
@@ -674,13 +677,18 @@
           @cancel="closeProcess($event, 'handleVisible', closeParent)"
         />
         <circulate
-        v-else-if="isFlow &&
+          v-else-if="
+            isFlow &&
             nodeInfo.nextNode &&
-            startFlowPageEmbeddedIntoStartFlowIndex && directCreateCircularReadWhenFlowStarted"
+            startFlowPageEmbeddedIntoStartFlowIndex &&
+            directCreateCircularReadWhenFlowStarted
+          "
           ref="flowCirculate"
           :label-position="formLabelPosition"
           :businessId="businessId"
-          :startFlowPageEmbeddedIntoStartFlowIndex="startFlowPageEmbeddedIntoStartFlowIndex"
+          :startFlowPageEmbeddedIntoStartFlowIndex="
+            startFlowPageEmbeddedIntoStartFlowIndex
+          "
           :processDefinitionId="nodeInfo.nextNode"
           :simpleTips="simpleTips"
           :showBtn="false"
@@ -1134,9 +1142,9 @@ export default {
       type: String,
       default: 'left'
     },
-    flowListDisabled:{
-      type:Boolean,
-      default:false
+    flowListDisabled: {
+      type: Boolean,
+      default: false
     },
     btnList: {
       type: Array,
@@ -2563,6 +2571,12 @@ export default {
      * @date 2022年5月25日
      **/
     selecNext(val, type, isDef) {
+      console.log(val, 'valvalval');
+      let isNextNode = false;
+      if (type) {
+        isNextNode = this.operationList.filter((x) => x.key == val)[0]
+          .isNextNode;
+      }
       this.loading = util.loading(this.$loading, '加载中...');
       if (this.multiple) {
         this.nextNode.nextUserId = [];
@@ -2573,7 +2587,8 @@ export default {
       this.selectUserList = [];
       this.radioList = [];
 
-      if (type) {
+      if (type && !isNextNode) {
+        console.log('不是下一步节点');
         this.isNextUser = false;
         this.isShowNode = false;
         this.isMainSubProcess = false;
@@ -2590,12 +2605,30 @@ export default {
         this.nextNode.isReturnRejectNode = 0;
         this.nextNode.isSerialSubmit = 0;
         this.nodeInfos = [];
+        let newOperationList = [];
+        // this.operationList.map(x => {
+
+        // })
         this.operationList.forEach((item) => {
           if (item.key === val) {
             if (!item.taskNodeList) {
               this.nodeInfos = [];
             } else {
-              this.nodeInfos = item.taskNodeList;
+              if (isDef) {
+                item.taskNodeList.map((x) => {
+                  if (x.nodeName == '编号') {
+                    this.operationList.push({
+                      key: x.nodeId,
+                      value: x.nodeName,
+                      isNextNode: true
+                    });
+                  }
+                });
+              }
+
+              this.nodeInfos = item.taskNodeList.filter(
+                (x) => x.nodeName != '编号'
+              );
             }
             return;
           }
@@ -2613,7 +2646,10 @@ export default {
           this.nextNode.nextNodeId = this.nodeInfos[0].nodeId;
         }
       }
-
+      if(isNextNode){
+        this.nodeInfos = [];
+        this.nextNode.nextNodeId = val
+      }
       if (val === 9) {
         this.isReject = true;
       } else {
@@ -3210,18 +3246,7 @@ export default {
      * @date 2022年5月25日
      **/
     subProcess(val, type) {
-      if (
-        this.isFlow &&
-        this.nodeInfo.nextNode &&
-        this.startFlowPageEmbeddedIntoStartFlowIndex
-      ) {
-        if(this.directCreateCircularReadWhenFlowStarted){
-           this.$refs.flowCirculate.subMit()
-        }else{
-          this.$refs.processFormIndex.subProcess('nextNode');
-        }
-        return;
-      }
+      
       return this.$refs['nextNode'].validate((valid) => {
         if (valid) {
           if (this.isSubmitButtonShowAgreeAndDisagree == 1) {
@@ -3341,6 +3366,18 @@ export default {
     },
 
     sendData(freetype) {
+      if (
+        this.isFlow &&
+        this.nodeInfo.nextNode &&
+        this.startFlowPageEmbeddedIntoStartFlowIndex
+      ) {
+        if (this.directCreateCircularReadWhenFlowStarted) {
+          this.$refs.flowCirculate.subMit();
+        } else {
+          this.$refs.processFormIndex.subProcess('nextNode');
+        }
+        return;
+      }
       this.$refs['nextNode'].validate(async (valid) => {
         if (valid) {
           if (this.isFlow) {

package/packages/flow/src/processForm.vue

@@ -15,6 +15,7 @@
     >
       <div :style="`height:${showBtn? '430px': 'auto'}; overflow-y: auto; margin-bottom: 10px`">
         <el-form-item
+        v-show="showBtn"
           prop="nodeName"
           label="当前节点"
           :rules="[
@@ -243,7 +244,7 @@
             v-model="nextNode.handleExplain"
           />
         </el-form-item>
-        <el-form-item prop="noticeType" label="通知方式">
+        <el-form-item prop="noticeType" label="通知方式" v-show="showBtn">
           <el-checkbox-group v-model="nextNode.noticeType">
             <el-checkbox
               v-for="item of nextNode.noticeList"
@@ -260,7 +261,7 @@
           </el-checkbox-group>
         </el-form-item>
         <el-form-item
-          v-show="nextNode.noticeType.length != 0"
+          v-show="nextNode.noticeType.length != 0 && showBtn"
           prop="nextNode"
           label="通知消息"
         >
@@ -322,6 +323,41 @@
         </div>
       </el-form-item>
     </el-form>
+    <div v-if="!showBtn" style="padding: 5px; background: #fff">
+          <div class="news" @click="showNews = !showNews">
+            <span class="news-item">消息通知</span>
+            <span :class="showNews ? 'show' : 'sj'"></span>
+          </div>
+          <div v-if="showNews" ref="messagebox" style="transition: 1s">
+            <el-checkbox-group v-model="nextNode.noticeType">
+              <el-checkbox
+                v-for="item of nextNode.noticeList"
+                :key="item.cciValue"
+                :label="item.cciValue"
+                :disabled="
+                  readOnlyNotificationType
+                    ? readOnlyNotificationType.indexOf(item.cciValue) != -1
+                    : false
+                "
+              >
+                {{ item.shortName }}
+              </el-checkbox>
+            </el-checkbox-group>
+            <es-input
+              style="
+                border-color: #ccc;
+                padding: 5px;
+                border-radius: 5px;
+                font-size: 13px;
+              "
+              autosize
+              v-show="showNews"
+              type="textarea"
+              v-model="nextNode.noticeInfo"
+              :readonly="notificationMessageReadOnly"
+            />
+          </div>
+        </div>
   </div>
 </template>
 
@@ -406,6 +442,7 @@ export default {
       customPresetHintMessage: '', //流程预设标题
       nextNodeCheckType: 'select',
       nextOperateCheckType: 'select',
+      showNews: false, // 是否展示通知信息
       notificationMessageReadOnly: false,
       readOnlyNotificationType: '',
       show: true,

package/packages/flow/src/processReject.vue

@@ -10,7 +10,8 @@
       ref="nextNode"
       :model="nextNode"
       class="demo-dynamic"
-      label-width="110px"
+      label-width="100px"
+      label-align="left"
     >
     <div style="max-height: 290px; overflow-y: auto; margin-bottom: 10px">
       <el-form-item prop="nodeName" label="当前节点">

package/packages/flow/src/reset.vue

@@ -32,6 +32,7 @@
           ]"
         >
           <el-select
+          v-if="nextNodeCheckType == 'select'"
             v-model="nextNode.nextNode"
             :placeholder="`请选择下步节点`"
             @change="changeSel"
@@ -43,6 +44,14 @@
               :value="items.nodeId"
             ></el-option>
           </el-select>
+           <es-radio-group
+            v-else-if="nextNodeCheckType == 'radio'"
+            v-model="nextNode.nextNode"
+            :data="nextNode.nodeInfo"
+            @change="changeSel"
+            value-key="nodeId"
+            label-key="nodeName"
+          ></es-radio-group>
         </el-form-item>
         <el-form-item
           v-if="countersignaturetypeCode != 0"
@@ -253,6 +262,7 @@ export default {
       loading: false,
       isCustomUser: 0,
       selectUser: false,
+      nextNodeCheckType: 'select',
       multiple: false,
       showNoticeType: false,
       readMultiple: true,
@@ -824,6 +834,8 @@ export default {
           this.loading = false;
           const { status, message, data } = res;
           if (status == 'success') {
+            data.nextNodeCheckType &&
+              (this.nextNodeCheckType = data.nextNodeCheckType);
             this.pendtitle = data.pendtitle || data.taskExamine.businessName;
             this.customPresetHintMessage = data.customPresetHintMessage;
             this.readOnlyNotificationType = data.readOnlyNotificationType;

package/src/index.js

@@ -125,7 +125,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.6.78',
+  version: '0.6.80',
   install,
   Button,
   ButtonGroup,