eoss-ui 0.6.91 → 0.6.92

package/lib/selector.js

@@ -4157,7 +4157,7 @@ module.exports = require("axios");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=31df2fd0&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=6cd08dd8&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4754,7 +4754,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=31df2fd0&
+// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=6cd08dd8&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -5003,6 +5003,8 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
 //
 //
 //
+//
+//
 
 
 
@@ -5123,7 +5125,13 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
         };
       }
     },
+    //混选
     mix: Boolean,
+    //混选时是否分类显示
+    classify: {
+      type: Boolean,
+      default: true
+    },
     noMatchText: {
       type: String,
       default: '无匹配数据'
@@ -5476,7 +5484,7 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
     getLabel: function getLabel(res) {
       var tag = '';
       if (this.mix) {
-        tag = util["a" /* default */].getTypeName(res.stype);
+        tag = this.classify ? util["a" /* default */].getTypeName(res.stype) : '';
       } else if (this.showFilterListDep) {
         tag = this.getDep(res);
       }

package/lib/upload.js

@@ -4351,8 +4351,8 @@ module.exports = require("js-base64");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=8bdc905c&
-var mainvue_type_template_id_8bdc905c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=02b1ced8&
+var mainvue_type_template_id_02b1ced8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4733,10 +4733,10 @@ var mainvue_type_template_id_8bdc905c_render = function () {
     : _vm._e()
 }
 var staticRenderFns = []
-mainvue_type_template_id_8bdc905c_render._withStripped = true
+mainvue_type_template_id_02b1ced8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=8bdc905c&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=02b1ced8&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -5566,7 +5566,7 @@ var _props;
         } else {
           var file = res.response ? res.response : res;
           var url = typeof this.preview === 'string' ? this.preview : typeof this.preview === 'function' ? this.preview(file) : null;
-          if (res.status === 'success') {
+          if (res.status === 'success' || res.status == 0) {
             var suffix = file.suffix;
             suffix = suffix.toLowerCase();
             if (this.dochubConfig.previewDocumentUrl) {
@@ -5711,7 +5711,7 @@ var _props;
     handleBeforeRemove: function handleBeforeRemove(file, fileList) {
       var _this7 = this;
 
-      if (file && file.status === 'success') {
+      if (file && (file.status === 'success' || file.status == 0)) {
         return this.$confirm('确定删除文件吗?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -5719,7 +5719,7 @@ var _props;
         }).then(function () {
           if (_this7.beforeRemove) {
             return _this7.beforeRemove(file, fileList);
-          } else if (file.status === 'success') {
+          } else if (file.status === 'success' || file.status == 0) {
             var userName = file.userName || file.response && file.response.userName || util["a" /* default */].getStorage('userName');
             // eslint-disable-next-line no-undef
             return new Promise(function (resolve, reject) {
@@ -5766,7 +5766,7 @@ var _props;
       util["a" /* default */].win.open(this.host + url + '?ownId=' + this.ownId + '&code=' + this.code + (this.extendCode ? '&extendCode=' + this.extendCode : '') + '&businessId=' + this.ownId + '&fileName=文档.zip' + '&bucketCode=' + this.code);
     },
     handleDownload: function handleDownload(file) {
-      if (file.status === 'success') {
+      if (file.status === 'success' || file.status == 0) {
         var url = typeof this.download === 'string' ? this.download : this.dochubConfig.downloadDocumentUrl || api["v" /* downloadByAdjunctId */];
         util["a" /* default */].win.open(this.host + url + '?adjunctId=' + (file.adjunctId || file.response.adjunctId) + '&documentId=' + (file.adjunctId || file.response.adjunctId));
       } else {
@@ -5795,7 +5795,7 @@ var _props;
           this.onSort(files);
         } else {
           var ids = files.map(function (item) {
-            if (item.status === 'success') {
+            if (item.status === 'success' || item.status == 0) {
               return item.adjunctId || item.response.adjunctId;
             }
           });
@@ -5914,7 +5914,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_8bdc905c_render,
+  mainvue_type_template_id_02b1ced8_render,
   staticRenderFns,
   false,
   null,

package/package.json

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

package/packages/flow/src/main.vue

@@ -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 : '外单位'"
                 >
@@ -1997,7 +1997,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();
@@ -3399,7 +3399,7 @@ 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;

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/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/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/index.js

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