eoss-ui 0.6.81 → 0.6.82

package/package.json

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

package/packages/flow/src/main.vue

@@ -215,7 +215,7 @@
       </el-form>
       <div
         v-show="
-          (!endFlow || nodeInfos.length > 1) &&
+          (!endFlow || nodeInfos.length > 1 || taskOperationShiftedNodeList) &&
           newTypeCode != 'fenyue' &&
           !shrink
         "
@@ -669,6 +669,7 @@
           "
           :label-position="formLabelPosition"
           :showBtn="false"
+          :formTitle="formTitle"
           :copy-history="freeStartFlowParams.pendedHistoryHandle"
           :process-definition-id="freeStartFlowNextNode || nodeInfo.nextNode"
           :opinion="value"
@@ -1162,6 +1163,7 @@ export default {
     },
     beforeSubmit: Function,
     title: { type: String, default: '流程办理' },
+    formTitle: { type: String, default: '' },
     closeParent: Boolean,
     param: {
       type: Object,
@@ -1187,6 +1189,7 @@ export default {
     return {
       styles: {},
       optionsKey: 0,
+      taskOperationShiftedNodeList:null,
       currentNodeEnableItemHandleDescription: false,
       startFlowPageEmbeddedIntoStartFlowIndex: false,
       pendingItemHandleDescription: '',
@@ -2572,7 +2575,6 @@ 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]
@@ -2588,8 +2590,7 @@ export default {
       this.selectUserList = [];
       this.radioList = [];
 
-      if (type && !isNextNode) {
-        console.log('不是下一步节点');
+      if (type) {
         this.isNextUser = false;
         this.isShowNode = false;
         this.isMainSubProcess = false;
@@ -2606,30 +2607,16 @@ 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 {
-              // if (isDef) {
-              //   item.taskNodeList.map((x) => {
-              //     if (x.nodeName == '编号') {
-              //       this.operationList.push({
-              //         key: x.nodeId,
-              //         value: x.nodeName,
-              //         isNextNode: true
-              //       });
-              //     }
-              //   });
-              // }
+              this.nodeInfos = item.taskNodeList;
 
-              // this.nodeInfos = item.taskNodeList.filter(
-              //   (x) => x.nodeName != '编号'
-              // );
+              this.nodeInfos = item.taskNodeList.filter(
+                (x) =>this.taskOperationShiftedNodeList.indexOf(x.nodeId) == -1
+              );
             }
             return;
           }
@@ -2790,6 +2777,7 @@ export default {
                 isSpecial,
                 canPresetRead,
                 isCdjxjTaskHandle,
+                taskOperationShiftedNodeList,
                 taskButtonList,
                 simpleTips,
                 isCanPreAddSign
@@ -2800,6 +2788,13 @@ export default {
             }
             this.$emit('startTaskRead', res);
             this.$emit('start-task-read', res);
+            if(taskOperationShiftedNodeList && taskOperationShiftedNodeList.length>0){
+              this.taskOperationShiftedNodeList = []
+              taskOperationShiftedNodeList.map(x =>{
+                this.taskOperationShiftedNodeList.push(x.nodeId) 
+                taskOperations.push({key: x.nodeId, value: x.nodeName,isNextNode: true})
+              })
+            }
             this.pendingItemHandleDescription = pendingItemHandleDescription;
             if (currentOrgSelectorParams.enableCurrentOrgConfig == 'true') {
               this.currentOrgSelectorTabs =
@@ -3072,7 +3067,7 @@ export default {
       if (
         val == 'taskReadAndEnd' ||
         (val == true && type != 'taskRead') ||
-        val == 'transfer'
+        val == 'transfer' || this.typeCode == 'read'
       ) {
         this.flowSuccess(true);
         // this.$emit('success');

package/packages/flow/src/processForm.vue

@@ -13,9 +13,13 @@
       label-width="100px"
       :label-position="labelPosition"
     >
-      <div :style="`height:${showBtn? '430px': 'auto'}; overflow-y: auto; margin-bottom: 10px`">
+      <div
+        :style="`height:${
+          showBtn ? '430px' : 'auto'
+        }; overflow-y: auto; margin-bottom: 10px`"
+      >
         <el-form-item
-        v-show="showBtn"
+          v-show="showBtn"
           prop="nodeName"
           label="当前节点"
           :rules="[
@@ -324,40 +328,41 @@
       </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 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"
+          @change="handleChange"
+          :readonly="notificationMessageReadOnly"
+        />
+      </div>
+    </div>
   </div>
 </template>
 
@@ -429,6 +434,10 @@ export default {
       type: String,
       default: 'left'
     },
+    formTitle: {
+      type: String,
+      default: ''
+    },
     showBtn: { type: Boolean, default: true }
   },
   data() {
@@ -444,6 +453,7 @@ export default {
       nextOperateCheckType: 'select',
       showNews: false, // 是否展示通知信息
       notificationMessageReadOnly: false,
+      isChangeMessage: false,
       readOnlyNotificationType: '',
       show: true,
       enableCustomLimitTimeSetting: false,
@@ -501,6 +511,7 @@ export default {
       mixPresetList: [],
       isCdjxjTaskHandle: '',
       isShowNextUser: true,
+      oldMessage: '',
       mixOrgIdList: [], //办理对象混选
       nextNode: {
         nodeName: '',
@@ -535,9 +546,18 @@ export default {
       }
       // this.getStartFlow(val);
     },
-    opinion(val){
+    opinion(val) {
       this.newOpinion = this.opinion;
     },
+    formTitle: {
+      handler(val) {
+        if (!this.showBtn && !this.isChangeMessage) {
+          this.nextNode.noticeInfo = this.oldMessage.replace('{title}', val);
+        }
+      },
+      deep: true,
+      immediate: true
+    }
   },
   computed: {
     types() {
@@ -561,6 +581,9 @@ export default {
     }
   },
   methods: {
+    handleChange() {
+      this.isChangeMessage = true
+    },
     changeCustomLimitTime(val) {
       if (!Number(val) || val.indexOf('.') != -1 || Number(val) < 0) {
         this.$message.warning('请输入正确的天数');
@@ -713,11 +736,19 @@ export default {
         nodeId: this.nextNode.nextNode,
         businessId: this.id
       };
+      if (!this.showBtn) {
+        params.openMode = 'samepage';
+      }
       util
         .ajax({ url: getNotificationMsg, params, methods: 'post' })
         .then((res) => {
           if (res.status === 'success') {
-            this.nextNode.noticeInfo = res.message;
+            if (!this.showBtn) {
+              this.oldMessage = res.message;
+              this.nextNode.noticeInfo = res.message.replace('{title}', '');
+            } else {
+              this.nextNode.noticeInfo = res.message;
+            }
           }
         })
         .catch((err) => {

package/src/index.js

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