eoss-ui 0.6.45 → 0.6.46

package/packages/flow/src/main.vue

@@ -5,12 +5,13 @@
     :style="styles"
     v-if="!shrinkAbled"
   >
+  <Supervise :businessId="businessId"  v-if="typeCode == 'supervise'" />
     <reset
       style="height: 100%"
       :type="newTypeCode"
       :appId="resetAppId"
       :flowParams="param"
-      v-if="newTypeCode == 'reset' || newTypeCode == 'continuation'"
+      v-else-if="newTypeCode == 'reset' || newTypeCode == 'continuation'"
     />
     <div class="es-flow-content" v-else>
       <div class="es-flow-top">
@@ -52,7 +53,7 @@
           :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
         />
       </div>
-      <!-- <el-form
+      <el-form
         v-show="currentNodeIsCircularReadNode"
         ref="nextNode"
         :model="isFlow ? nodeInfo : nextNode"
@@ -84,9 +85,9 @@
             :disableds="otherOrgDisabledObjId"
             @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
             :types="['enterprise', 'filgroupobj']"
-            :params="{ filid: 'all' }"
+            :params="{ filid: 'all',roleid:circularReadParamsMap.circularReadOrgRoleCode}"
           /> </el-form-item
-      ></el-form> -->
+      ></el-form>
       <div
         v-show="
           (!endFlow || nodeInfos.length > 1) &&
@@ -809,6 +810,7 @@ import Reset from './reset.vue';
 import TaskUnionExamine from './component/taskUnionExamine.vue';
 import FreeStartFlow from './freeStartFlow.vue';
 import SelectUser from './selectUser.vue';
+import Supervise from './supervise.vue';
 import {
   findSysCodes,
   getHandleInfoHtml,
@@ -844,7 +846,8 @@ export default {
     [TaskUnionExamine.name]: TaskUnionExamine,
     [FreeStartFlow.name]: FreeStartFlow,
     Preset,
-    Reset
+    Reset,
+    Supervise
   },
   props: {
     showShrink: { type: Boolean, default: true },
@@ -899,6 +902,7 @@ export default {
       currentOrgDisabledObjId: [],
       nextNodeCheckType: 'select',
       readOnlyNotificationType: '',
+      circularReadParamsMap:{circularReadOrgRoleCode:''},
       taskParams: {},
       notificationMessageReadOnly: false,
       isCanPreAddSign: false,
@@ -1066,6 +1070,7 @@ export default {
   mounted() {
     this.businessIds = this.businessId;
     this.nextNode.nextNodeId = this.nextNodeId;
+    if(this.typeCode == 'supervise') return
     this.getNodeType();
     !this.isFlow &&
       (this.newTypeCode = this.typeCode || this.$route.query.typecode);
@@ -2268,6 +2273,7 @@ export default {
                 isCustomPreset,
                 presetTaskNodeKeyStr,
                 presetTaskNodeMap,
+                circularReadParamsMap,
                 isPreset,
                 choiceOrgId,
                 choiceDeptId,
@@ -2294,6 +2300,7 @@ export default {
             } = res;
             this.$emit('startTaskRead', res);
             this.$emit('start-task-read', res);
+            this.circularReadParamsMap=circularReadParamsMap || {}
             this.currentOrgName = currentOrgName;
             this.currentNodeIsCircularReadNode =
               nodeInfoMap.nodeExtAttr.currentNodeIsCircularReadNode == 1;
@@ -2739,7 +2746,8 @@ export default {
         this.$message.warning(`请选择${this.currentOrgName || '本单位'}`);
         return false;
       }
-      if(this.currentNodeIsCircularReadNode && !this.nextNode.nextCurrentOrgObj && !this.nextNode.nextOtherOrgObj){
+      
+      if(this.currentNodeIsCircularReadNode  && this.nextNode.nextCurrentOrgObj.length == 0 && this.nextNode.nextOtherOrgObj.length == 0){
         this.$message.warning(`请选择处理对象!`);
         return false
       }
@@ -2849,7 +2857,8 @@ export default {
             pOrgId,
             taskExamineInfo,
             currentNodeIsCircularReadNode,
-            needRetrialAuth
+            needRetrialAuth,
+            circularReadParamsMap
           } = this;
           params.isEndUserTask = isEndUserTask;
           params.choiceOrgId = choiceOrgId;
@@ -2863,7 +2872,10 @@ export default {
           params.nodeId = taskExamineInfo.nodeId;
           params.needRetrialAuth = needRetrialAuth;
           params.taskHandleSubmitMode = currentNodeIsCircularReadNode ? 'circularReadMode' : undefined;
-          // params.orgRoleCode="5f5c8e900dc6433fb5c7b3bcc1a81319"
+          if(currentNodeIsCircularReadNode){
+            params.orgRoleCode=circularReadParamsMap.circularReadOrgRoleCode
+          }
+          
           return util
             .ajax({ url: taskHandleHtml, method: 'post', data: params })
             .then((res) => {

package/packages/flow/src/supervise.vue

@@ -0,0 +1,138 @@
+<template>
+  <div class="supervise-flow">
+    <el-form
+      ref="nextNode"
+      :model="nextNode"
+      class="demo-dynamic"
+      label-width="120px"
+      label-position="left"
+    >
+      <el-form-item prop="pendTitle" label="标题">
+        <el-input v-model="nextNode.pendTitle" disabled type="textarea" autosize />
+      </el-form-item>
+      <el-form-item prop="currentHandleNode" label="当前办理节点">
+        <el-input v-model="nextNode.currentHandleNode" disabled />
+      </el-form-item>
+      <el-form-item prop="pendingUserNames" label="当前办理人">
+        <el-input type="textarea" autosize v-model="nextNode.pendingUserNames" disabled />
+      </el-form-item>
+      <el-form-item prop="noticeType" label="通知方式">
+          <el-checkbox-group v-model="nextNode.noticeType">
+            <el-checkbox
+              v-for="(item,index) of nextNode.notificationType"
+              :key="index"
+              :label="item.cciValue"
+            >
+              {{ item.shortName }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <!-- v-show="nextNode.noticeType.length != 0" -->
+        <el-form-item
+          prop="notifyMessage"
+          label="通知消息"
+        >
+          <es-input
+            style="
+              border-color: #ccc;
+              padding: 5px;
+              border-radius: 5px;
+              font-size: 13px;
+            "
+            type="textarea"
+            v-model="nextNode.notifyMessage"
+          />
+        </el-form-item>
+        <el-form-item style="margin-bottom: 0px">
+        <div style="text-align: right">
+          <el-button
+            type="primary"
+            size="small"
+            @click="subProcess()"
+          >
+            确认
+          </el-button>
+        </div>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { toTaskSupervise, toTaskSuperviseSub } from 'eoss-ui/src/config/api';
+import util from 'eoss-ui/src/utils/util';
+export default {
+  props: {
+    businessId: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      nextNode: {
+        noticeType:[],
+        notificationType:[],
+        loading:undefined
+      }
+    };
+  },
+  mounted() {
+    this.getFlowInfo();
+  },
+  methods: {
+    subProcess(){
+        if(this.nextNode.noticeType.length == 0){
+            this.$message.warning('请选择通知方式');
+            return
+        }
+        if(!this.nextNode.notifyMessage){
+            this.$message.warning('请填写通知消息内容');
+            return
+        }
+        let {noticeType,notifyMessage,pendingUserIds} = this.nextNode
+        let params = {
+           url:toTaskSuperviseSub,
+           params:{
+            userId:util.getStorage('userId'),
+            urgeUserIds:pendingUserIds,
+            notificationType:noticeType.join(','),notificationMessage:notifyMessage,
+            businessId:this.businessId
+           }
+        }
+        this.loading = util.loading(this.$loading, '提交中...');
+       util.ajax(params).then(res => {
+        this.loading.close();
+        if(res.rCode == 0 || res.status=='success'){
+            this.$message.success('操作成功');
+            this.$parent.$emit('success')
+        }else{
+            this.$message.error(res.message || '系统错误，请联系管理员！');
+        }
+       })
+    },
+    
+    getFlowInfo() {
+        this.loading = util.loading(this.$loading, '加载中...');
+      util
+        .ajax({
+          url: toTaskSupervise,
+          params: {
+            businessId: this.businessId,
+            userId: util.getStorage('userId')
+          }
+        })
+        .then((res) => {
+            this.loading.close();
+          console.log(res);
+          if(res.rCode == 0){
+            this.nextNode = {...this.nextNode,...res.results};
+            this.nextNode.noticeType = res.results.defaultNotificationType.split(',');
+          }
+        });
+    }
+  }
+};
+</script>
+
+<style></style>

package/packages/form/src/main.vue

@@ -504,7 +504,6 @@
                           v-model="models[item.name]"
                           btn-size="medium"
                           :readonly="readonly ? readonly : item.readonly"
-                          :fileCount.sync="fileCount"
                           :rules="item.rules"
                           v-on="
                             handleExclAttribute({
@@ -517,6 +516,7 @@
                               handleChange(item, val);
                             }
                           "
+                          @getFilesAmount="$emit('getFilesAmount', $value)"
                         ></es-upload>
                         <es-selector
                           v-bind="
@@ -1498,7 +1498,6 @@
                     "
                     :ownId="item.ownId || models.id"
                     btn-size="medium"
-                    v-model="models[item.name]"
                     :readonly="readonly ? readonly : item.readonly"
                     :rules="item.rules"
                     v-on="
@@ -1512,6 +1511,7 @@
                         handleChange(item, val);
                       }
                     "
+                    @getFilesAmount="$emit('getFilesAmount', $value)"
                   ></es-upload>
                   <es-selector
                     v-bind="
@@ -2394,8 +2394,7 @@ export default {
       uuid: util.uuid(32),
       dialog: false,
       refresh: true,
-      ready: false,
-      fileCount: 0
+      ready: false
     };
   },
   computed: {

package/packages/form/src/table.vue

@@ -24,6 +24,7 @@
             <td
               v-if="item.type === 'caption'"
               :colspan="col * 2"
+              :key="index"
               class="es-table-td-caption"
             >
               <div class="es-table-caption">{{ item.text }}</div>
@@ -31,6 +32,7 @@
             <td
               v-else-if="item.type === 'table'"
               :colspan="col * 2"
+              :key="index"
               class="es-table-form-data"
             >
               <es-data-table-form
@@ -390,6 +392,7 @@
                           handleChange(item, val);
                         }
                       "
+                      @getFilesAmount="$emit('getFilesAmount', $value)"
                     ></es-upload>
                     <es-selector
                       v-bind="
@@ -518,6 +521,7 @@
                           <es-button
                             v-if="inline.type == 'button' && !inline.hide"
                             class="es-button-inline"
+                            :key="k"
                             :disabled="isDisabled || inline.disabled"
                             v-bind="
                               handleExclAttribute({
@@ -1032,6 +1036,7 @@
     <template v-for="(item, index) in table">
       <es-data-table-form
         v-if="item.lazy"
+        :key="index"
         class="es-form-item-table"
         :data="model[item.name]"
         :full="false"
@@ -1058,6 +1063,7 @@
       </es-data-table-form>
       <es-data-table
         v-else
+        :key="index"
         class="es-form-item-table"
         ref="dataTable"
         :data="model[item.name]"

package/packages/handler/src/main.vue

@@ -282,7 +282,8 @@ export default {
     online: {
       type: Number,
       default: 1
-    }
+    },
+    singleLogout:Array
   },
   watch: {
     subSystem: {
@@ -399,6 +400,22 @@ export default {
         type: 'warning'
       })
         .then(() => {
+          let iframes = document.getElementsByTagName('iframe');
+          for (let i = 0; i < iframes.length; i++) {
+            let src = iframes[i] ? iframes[i].src : null;
+            let origin = util.win.location.origin;
+            if (src && util.startWith(src, 'http') && src.indexOf(origin) === -1) {
+              iframes[i] && iframes[i].contentWindow.postMessage('logout', '*');
+            }
+          }
+          if (this.singleLogout) {
+            for (let i = 0; i < this.singleLogout.length; i++) {
+              let iframe = document.createElement('iframe');
+              iframe.style.display = 'none';
+              iframe.src = this.singleLogout[i];
+              document.body.appendChild(iframe);
+            }
+          }
           util
             .ajax({ method: 'post', url: logout })
             .then((res) => {