eoss-ui 0.6.91 → 0.6.93

package/packages/flow/src/main.vue

@@ -97,7 +97,7 @@
 
       <el-button
         type="primary"
-        style="width: calc(100% - 18px);margin:8px auto"
+        style="width: calc(100% - 18px); margin: 8px auto"
         @click="handleClickCirculate()"
       >
         提交
@@ -502,7 +502,7 @@
                 </el-form-item>
 
                 <el-form-item
-                  v-if="isHideCurrentOrg"
+                  v-if="isHideCurrentOrg && nextNode.isReturnSubmitter != 1"
                   prop="nextCurrentOrgObj"
                   :label="currentOrgName ? currentOrgName : '本单位'"
                 >
@@ -517,7 +517,7 @@
                   />
                 </el-form-item>
                 <el-form-item
-                  v-if="isHideOtherOrg"
+                  v-if="isHideOtherOrg && nextNode.isReturnSubmitter != 1"
                   prop="nextOtherOrgObj"
                   :label="otherOrgName ? otherOrgName : '外单位'"
                 >
@@ -673,6 +673,8 @@
           :label-position="formLabelPosition"
           :showBtn="false"
           :formTitle="formTitle"
+          :urgencyLevel="urgencyLevel"
+          :messageType='newsList'
           :copy-history="freeStartFlowParams.pendedHistoryHandle"
           :process-definition-id="freeStartFlowNextNode || nodeInfo.nextNode"
           :opinion="value"
@@ -751,30 +753,27 @@
         </div>
       </div>
       <el-form
-          ref="nextNode"
-          :model="isFlow ? nodeInfo : nextNode"
-          v-if="isEndMessage"
-          class="demo-dynamic"
-          :label-width="
-            startFlowPageEmbeddedIntoStartFlowIndex ? '100px' : '120px'
-          "
-          style="padding:0px 8px"
-          :label-position="formLabelPosition"
-        >
-      <el-form-item
-                  prop="nextItemHandleDescription"
-                  label="办结意见"
-                >
-                  <el-input
-                    placeholder="请输入办结意见"
-                    type="textarea"
-                    :autosize="{ minRows: 2 }"
-                    v-model="endMessage"
-                    @change="handleEndMessageChange"
-                  />
-                </el-form-item>
+        ref="nextNode"
+        :model="isFlow ? nodeInfo : nextNode"
+        v-if="isEndMessage"
+        class="demo-dynamic"
+        :label-width="
+          startFlowPageEmbeddedIntoStartFlowIndex ? '100px' : '120px'
+        "
+        style="padding: 0px 8px"
+        :label-position="formLabelPosition"
+      >
+        <el-form-item prop="nextItemHandleDescription" label="办结意见">
+          <el-input
+            placeholder="请输入办结意见"
+            type="textarea"
+            :autosize="{ minRows: 2 }"
+            v-model="endMessage"
+            @change="handleEndMessageChange"
+          />
+        </el-form-item>
       </el-form>
-      
+
       <div
         class="es-flow-buttons"
         v-if="newTypeCode != 'fenyue' && !shrink"
@@ -790,8 +789,10 @@
           <el-button class="es-button-agree" @click="subProcess('不同意。')"
             >不同意</el-button
           >
-          <el-button class="es-button-agree-save"
-          v-if="!isHideTemporarySave" @click="saveInfo()"
+          <el-button
+            class="es-button-agree-save"
+            v-if="!isHideTemporarySave"
+            @click="saveInfo()"
             >暂存</el-button
           >
         </div>
@@ -806,7 +807,9 @@
         >
           <el-button
             v-show="isSubmitButtonShowAgreeAndDisagree != 1"
-            v-for="item of hideBtn || isHideTemporarySave ? btnList.slice(0, 1) : btnList"
+            v-for="item of hideBtn || isHideTemporarySave
+              ? btnList.slice(0, 1)
+              : btnList"
             :key="item.name"
             :type="item.type"
             :style="btnStyle"
@@ -1139,7 +1142,8 @@ import {
   checkForeignOrgStartedCircularRead,
   checkBusinessIdStartedReadTransferHandle,
   taskHandleHtml,
-  getNodeInfoForStart
+  getNodeInfoForStart,
+  getUrgencyLevelChangedNotificationType
 } from 'eoss-ui/src/config/api';
 import util from 'eoss-ui/src/utils/util';
 export default {
@@ -1195,6 +1199,10 @@ export default {
         callBack();
       }
     },
+    urgencyLevel: {
+      type: [String, Number],
+      default: ''
+    },
     beforeSubmit: Function,
     title: { type: String, default: '流程办理' },
     formTitle: { type: String, default: '' },
@@ -1218,15 +1226,15 @@ export default {
       type: [String, Number],
       default: 10
     },
-    isEndMessage: { type: Boolean, default: false },
+    isEndMessage: { type: Boolean, default: false }
   },
   data() {
     return {
       styles: {},
       optionsKey: 0,
-      endMessage:'',
-      isHideTemporarySave:false,
-      oldNextOperate:'',
+      endMessage: '',
+      isHideTemporarySave: false,
+      oldNextOperate: '',
       taskOperationShiftedNodeList: null,
       currentNodeEnableItemHandleDescription: false,
       startFlowPageEmbeddedIntoStartFlowIndex: false,
@@ -1409,6 +1417,7 @@ export default {
       currentOrgName: '', //本单位名称
       otherOrgName: '', //外单位名称
       needRetrialAuth: false, //是否二次鉴权
+      msgTypeCount: 0,
       nodeInfo: {
         nextNode: '',
         nextUser: '',
@@ -1433,6 +1442,17 @@ export default {
     }
   },
   watch: {
+    urgencyLevel: {
+      handler(val) {
+        if (val && this.msgTypeCount != 0) {
+          this.getAdminMsgType();
+        } else {
+          this.msgTypeCount++;
+        }
+      },
+      deep: true,
+      immediate: true
+    },
     isCirculate: {
       handler(val) {
         if (!val && this.showCirculate != undefined) {
@@ -1532,8 +1552,28 @@ export default {
     }
   },
   methods: {
-    handleEndMessageChange(){
-      this.$emit('endMessageChange',this.endMessage)
+    getAdminMsgType() {
+      let params = {
+        url: getUrgencyLevelChangedNotificationType,
+        params: { urgencyLevel: this.urgencyLevel }
+      };
+      util.ajax(params).then((res) => {
+        if (res.rCode == 0) {
+          this.newsList = res.results.latestChangedNotificationType;
+          let arr = [];
+          this.newsList.map((item) => {
+            this.nextNode.notificationType.map((x) => {
+              if (x == item.cciValue) {
+                arr.push(x);
+              }
+            });
+          });
+          this.nextNode.notificationType = arr;
+        }
+      });
+    },
+    handleEndMessageChange() {
+      this.$emit('endMessageChange', this.endMessage);
     },
     getInfo() {
       if (this.typeCode == 'supervise' || this.typeCode == 'read') return;
@@ -1561,7 +1601,8 @@ export default {
       };
       util.ajax(params).then((res) => {
         if (res.status == 'success') {
-          this.isHideTemporarySave = res.data.nodeExtAttr.isHideTemporarySave == 1
+          this.isHideTemporarySave =
+            res.data.nodeExtAttr.isHideTemporarySave == 1;
           this.isBanInputOpinion = res.data.nodeExtAttr.isBanInputOpinion;
           this.directCreateCircularReadWhenFlowStarted =
             res.data.nodeExtAttr.directCreateCircularReadWhenFlowStarted == 1;
@@ -1593,7 +1634,7 @@ export default {
       this.freeStartFlowParams.startFlowBusinessId =
         this.taskExamineInfo.businessId;
       this.freeStartFlowNextNode = this.taskExamineInfo.processDefinitionId;
-      const { businessId, appId, processDefinitionId, pendingId,isSubFlow } =
+      const { businessId, appId, processDefinitionId, pendingId, isSubFlow } =
         this.taskExamineInfo;
       let params = {
         businessId,
@@ -1916,7 +1957,7 @@ export default {
           params: {
             ccCode: 'notification_type',
             userId: util.getStorage('userId'),
-            pendingId:this.pendingId
+            pendingId: this.pendingId
           }
         })
         .then((res) => {
@@ -1997,7 +2038,7 @@ export default {
       };
       this.loading = util.loading(this.$loading, '保存中...');
       util
-        .ajax({ url: tempSave, params })
+        .ajax({ url: tempSave, data: params, method: 'post' })
         .then((res) => {
           const { status, message } = res;
           if (!isSave) this.loading.close();
@@ -2630,11 +2671,12 @@ export default {
       } else {
         this.nextNode.nextUserId = '';
       }
-      if(isNextNode){
-        this.oldNextOperate = this.operationList.filter((x) => x.key == val)[0]
-          .nextOperate
-      }else{
-        this.oldNextOperate = ''
+      if (isNextNode) {
+        this.oldNextOperate = this.operationList.filter(
+          (x) => x.key == val
+        )[0].nextOperate;
+      } else {
+        this.oldNextOperate = '';
       }
       this.options = [];
       this.selectUserList = [];
@@ -2851,12 +2893,13 @@ export default {
                 taskOperations.push({
                   key: x.nodeId,
                   value: x.nodeName,
-                  nextOperate:x.nextOperate,
+                  nextOperate: x.nextOperate,
                   isNextNode: true
                 });
               });
             }
-            this.isHideTemporarySave = nodeInfoMap.nodeExtAttr.isHideTemporarySave == 1
+            this.isHideTemporarySave =
+              nodeInfoMap.nodeExtAttr.isHideTemporarySave == 1;
             this.pendingItemHandleDescription = pendingItemHandleDescription;
             if (currentOrgSelectorParams.enableCurrentOrgConfig == 'true') {
               this.currentOrgSelectorTabs =
@@ -2865,7 +2908,10 @@ export default {
                 currentOrgSelectorParams.currentOrgRange.split(',');
               this.currentOrgSelectorTabs.map((x, i) => {
                 this.currentOrgSelectorParams[x] = {
-                  filid: currentOrgparams[i] == 'my' ? choiceOrgId : currentOrgparams[i]
+                  filid:
+                    currentOrgparams[i] == 'my'
+                      ? choiceOrgId
+                      : currentOrgparams[i]
                 };
               });
             }
@@ -3399,7 +3445,8 @@ export default {
         (this.currentNodeIsCircularReadNode ||
           (this.isHideOtherOrg && this.isHideCurrentOrg)) &&
         this.nextNode.nextCurrentOrgObj.length == 0 &&
-        this.nextNode.nextOtherOrgObj.length == 0
+        this.nextNode.nextOtherOrgObj.length == 0 &&
+        this.nextNode.isReturnSubmitter != 1
       ) {
         this.$message.warning(`请选择下步办理对象!`);
         return false;
@@ -3481,7 +3528,11 @@ export default {
           }
           if (
             (this.nextNode.nextOperate != 0 &&
-            this.nextNode.nextOperate != 1 && this.oldNextOperate === '') || (this.oldNextOperate !== '' && this.oldNextOperate != 0 && this.oldNextOperate != 1)
+              this.nextNode.nextOperate != 1 &&
+              this.oldNextOperate === '') ||
+            (this.oldNextOperate !== '' &&
+              this.oldNextOperate != 0 &&
+              this.oldNextOperate != 1)
           ) {
             delete this.nextNode.nextNodeId;
           }
@@ -3497,10 +3548,13 @@ export default {
           if (!this.isCanPreAddSign || this.nextNode.isAddSign != '1') {
             delete this.nextNode.addSignMode;
           }
-         
+
           let params = {
             ...this.nextNode,
-            nextOperate:this.oldNextOperate!==''?this.oldNextOperate : this.nextNode.nextOperate, 
+            nextOperate:
+              this.oldNextOperate !== ''
+                ? this.oldNextOperate
+                : this.nextNode.nextOperate,
             pendingId: this.pendingId,
             opinion:
               this.isForceDisplayDefaultOptionForPrefix &&

package/packages/flow/src/processForm.vue

@@ -443,7 +443,15 @@ export default {
       type: String,
       default: ''
     },
-    showBtn: { type: Boolean, default: true }
+    showBtn: { type: Boolean, default: true },
+    messageType:{
+      type:Array,
+      default: () => []
+    },
+    urgencyLevel:{
+      type:[Number,String],
+      default:''
+    }
   },
   data() {
     return {
@@ -534,11 +542,30 @@ export default {
         nodeInfo: [],
         userInfo: [],
         handleExplain: '',
-        noticeList: []
+        noticeList: [],
+        msgTypeCount:0
       }
     };
   },
   watch: {
+    messageType:{
+      handler(val) {
+        if (val.length > 0 && this.urgencyLevel && this.msgTypeCount != 0) {
+          this.nextNode.noticeList = val;
+          let arr = [];
+          this.nextNode.noticeList.map((item) => {
+            this.nextNode.noticeType.map((x) => {
+              if (x == item.cciValue) {
+                arr.push(x);
+              }
+            });
+          });
+          this.nextNode.noticeType = arr;
+        }else{
+          this.msgTypeCount++
+        }
+      }
+    },
     processDefinitionId(val) {
       Object.assign(this.$data, this.$options.data());
       this.getUserInfo();

package/packages/flow/src/selectUser.vue

@@ -66,7 +66,8 @@
         :types="types"
         :tabs="tabs"
         :title="title"
-        :collapse-tags="3"
+        :classify="classify"
+        :collapse-tags="2"
         :mix="mix"
         :min="isUnionSeal ? 1 : 0"
         :disabled="!isCustomUser || isCurrentNodeForbiddenChangeCandidate == 1"
@@ -79,11 +80,11 @@
             : 'no-icon'
         "
         :select="isUnionSeal == false"
-        :where="newWhere"
+        :where="{ ...newWhere, info: classify ? '' : 'no' }"
         :multiple="newMultiple"
         @cancel="cancelSelectUser"
         @change="getSelectUser"
-        :param="{ ...newParams, info: 'no' }"
+        :param="{ ...newParams, info: classify ? '' : 'no' }"
         :disableds="disableds"
         ><i class="es-icon-user"></i
       ></es-selector>
@@ -177,6 +178,7 @@ export default {
     return {
       searchLoading: false,
       newNextUser: [],
+      classify:true,
       newOptions: [],
       newSelectUserList: [],
       url: handleInfo,
@@ -266,6 +268,9 @@ export default {
       immediate: true
     }
   },
+  mounted() {
+    this.classify = util.getStorage('classify')!= undefined ? util.getStorage('classify') : true;
+  },
 
   methods: {
     changeInfo(data) {

package/packages/select/src/main.vue

@@ -751,7 +751,7 @@ export default {
             tree:
               typeof this.tree === 'boolean'
                 ? this.tree
-                : { ...this.tree, lazy: this.label },
+                : { ...this.tree, lazy: this.lazy },
             data: this.results,
             // 父级是否可选
             parentCheck: this.parentCheck,

package/packages/selector/src/main.vue

@@ -38,7 +38,9 @@
                   collapseTags === true ? 1 : collapseTags
                 )"
                 :key="getValueKey(item)"
-                :closable="!selectorDisabled && !readonly && selected.length > min"
+                :closable="
+                  !selectorDisabled && !readonly && selected.length > min
+                "
                 type="info"
                 disable-transitions
                 @close="deleteTag($event, item, index)"
@@ -354,7 +356,13 @@ export default {
         };
       }
     },
+    //混选
     mix: Boolean,
+    //混选时是否分类显示
+    classify: {
+      type: Boolean,
+      default: true
+    },
     noMatchText: {
       type: String,
       default: '无匹配数据'
@@ -727,7 +735,7 @@ export default {
     getLabel(res) {
       let tag = '';
       if (this.mix) {
-        tag = util.getTypeName(res.stype);
+        tag = this.classify?util.getTypeName(res.stype) : '';
       } else if (this.showFilterListDep) {
         tag = this.getDep(res);
       }

package/packages/tree/src/main.vue

@@ -58,6 +58,7 @@
           :empty-text="!loading ? '暂无数据' : ''"
           :node-key="nodeKey"
           :indent="12"
+          :lazy="lazy"
           :data="treeData"
           :props="defaultProps"
           :filter-node-method="filterNode"

package/packages/upload/src/main.vue

@@ -904,7 +904,7 @@ export default {
               : typeof this.preview === 'function'
               ? this.preview(file)
               : null;
-          if (res.status === 'success') {
+          if (res.status === 'success' || res.status == 0) {
             let suffix = file.suffix;
             suffix = suffix.toLowerCase();
             if (this.dochubConfig.previewDocumentUrl) {
@@ -1108,7 +1108,7 @@ export default {
       return flag;
     },
     handleBeforeRemove(file, fileList) {
-      if (file && file.status === 'success') {
+      if (file && (file.status === 'success' || file.status == 0)) {
         return this.$confirm('确定删除文件吗?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -1117,7 +1117,7 @@ export default {
           .then(() => {
             if (this.beforeRemove) {
               return this.beforeRemove(file, fileList);
-            } else if (file.status === 'success') {
+            } else if (file.status === 'success' || file.status == 0) {
               let userName =
                 file.userName ||
                 (file.response && file.response.userName) ||
@@ -1194,7 +1194,7 @@ export default {
       );
     },
     handleDownload(file) {
-      if (file.status === 'success') {
+      if (file.status === 'success' || file.status == 0) {
         let url =
           typeof this.download === 'string'
             ? this.download
@@ -1231,7 +1231,7 @@ export default {
           this.onSort(files);
         } else {
           let ids = files.map((item) => {
-            if (item.status === 'success') {
+            if (item.status === 'success' || item.status == 0) {
               return item.adjunctId || item.response.adjunctId;
             }
           });

package/src/config/api.js

@@ -305,3 +305,4 @@ export const endFlowAndStartTaskCircularRead =
 export const getNodeInfoForStart =
   flowPendingPrefix + '/task/taskHandle/getNodeInfoForStart.dhtml';
 export const freeStartFlow = '/bpm/bpmBackend/freeStartFlow';
+export const getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelChangedNotificationType';

package/src/index.js

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