eoss-ui 0.6.71 → 0.6.73

package/lib/tips.js

@@ -193,6 +193,8 @@ var ajax = function ajax(_ref) {
       params = _ref$params === undefined ? {} : _ref$params,
       _ref$format = _ref.format,
       format = _ref$format === undefined ? true : _ref$format,
+      _ref$formatConfig = _ref.formatConfig,
+      formatConfig = _ref$formatConfig === undefined ? {} : _ref$formatConfig,
       _ref$mix = _ref.mix,
       mix = _ref$mix === undefined ? false : _ref$mix,
       _ref$defaults = _ref.defaults,
@@ -202,7 +204,7 @@ var ajax = function ajax(_ref) {
       secret = _ref.secret,
       encodes = _ref.encodes,
       oldmode = _ref.oldmode,
-      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'formatConfig', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -477,7 +479,7 @@ var ajax = function ajax(_ref) {
     }
   }
   if (method === 'post' && format) {
-    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data);
+    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data, formatConfig);
     if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }

package/lib/tree-group.js

@@ -193,6 +193,8 @@ var ajax = function ajax(_ref) {
       params = _ref$params === undefined ? {} : _ref$params,
       _ref$format = _ref.format,
       format = _ref$format === undefined ? true : _ref$format,
+      _ref$formatConfig = _ref.formatConfig,
+      formatConfig = _ref$formatConfig === undefined ? {} : _ref$formatConfig,
       _ref$mix = _ref.mix,
       mix = _ref$mix === undefined ? false : _ref$mix,
       _ref$defaults = _ref.defaults,
@@ -202,7 +204,7 @@ var ajax = function ajax(_ref) {
       secret = _ref.secret,
       encodes = _ref.encodes,
       oldmode = _ref.oldmode,
-      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'formatConfig', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -477,7 +479,7 @@ var ajax = function ajax(_ref) {
     }
   }
   if (method === 'post' && format) {
-    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data);
+    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data, formatConfig);
     if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }

package/lib/tree.js

@@ -193,6 +193,8 @@ var ajax = function ajax(_ref) {
       params = _ref$params === undefined ? {} : _ref$params,
       _ref$format = _ref.format,
       format = _ref$format === undefined ? true : _ref$format,
+      _ref$formatConfig = _ref.formatConfig,
+      formatConfig = _ref$formatConfig === undefined ? {} : _ref$formatConfig,
       _ref$mix = _ref.mix,
       mix = _ref$mix === undefined ? false : _ref$mix,
       _ref$defaults = _ref.defaults,
@@ -202,7 +204,7 @@ var ajax = function ajax(_ref) {
       secret = _ref.secret,
       encodes = _ref.encodes,
       oldmode = _ref.oldmode,
-      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'formatConfig', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -477,7 +479,7 @@ var ajax = function ajax(_ref) {
     }
   }
   if (method === 'post' && format) {
-    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data);
+    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data, formatConfig);
     if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }

package/lib/upload.js

@@ -192,6 +192,8 @@ var ajax = function ajax(_ref) {
       params = _ref$params === undefined ? {} : _ref$params,
       _ref$format = _ref.format,
       format = _ref$format === undefined ? true : _ref$format,
+      _ref$formatConfig = _ref.formatConfig,
+      formatConfig = _ref$formatConfig === undefined ? {} : _ref$formatConfig,
       _ref$mix = _ref.mix,
       mix = _ref$mix === undefined ? false : _ref$mix,
       _ref$defaults = _ref.defaults,
@@ -201,7 +203,7 @@ var ajax = function ajax(_ref) {
       secret = _ref.secret,
       encodes = _ref.encodes,
       oldmode = _ref.oldmode,
-      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'formatConfig', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -476,7 +478,7 @@ var ajax = function ajax(_ref) {
     }
   }
   if (method === 'post' && format) {
-    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data);
+    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data, formatConfig);
     if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }

package/lib/utils/util.js

@@ -109,6 +109,8 @@ var ajax = function ajax(_ref) {
       params = _ref$params === undefined ? {} : _ref$params,
       _ref$format = _ref.format,
       format = _ref$format === undefined ? true : _ref$format,
+      _ref$formatConfig = _ref.formatConfig,
+      formatConfig = _ref$formatConfig === undefined ? {} : _ref$formatConfig,
       _ref$mix = _ref.mix,
       mix = _ref$mix === undefined ? false : _ref$mix,
       _ref$defaults = _ref.defaults,
@@ -118,7 +120,7 @@ var ajax = function ajax(_ref) {
       secret = _ref.secret,
       encodes = _ref.encodes,
       oldmode = _ref.oldmode,
-      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'formatConfig', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -393,7 +395,7 @@ var ajax = function ajax(_ref) {
     }
   }
   if (method === 'post' && format) {
-    data = _qs2.default.stringify(data);
+    data = _qs2.default.stringify(data, formatConfig);
     if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }

package/lib/wujie.js

@@ -193,6 +193,8 @@ var ajax = function ajax(_ref) {
       params = _ref$params === undefined ? {} : _ref$params,
       _ref$format = _ref.format,
       format = _ref$format === undefined ? true : _ref$format,
+      _ref$formatConfig = _ref.formatConfig,
+      formatConfig = _ref$formatConfig === undefined ? {} : _ref$formatConfig,
       _ref$mix = _ref.mix,
       mix = _ref$mix === undefined ? false : _ref$mix,
       _ref$defaults = _ref.defaults,
@@ -202,7 +204,7 @@ var ajax = function ajax(_ref) {
       secret = _ref.secret,
       encodes = _ref.encodes,
       oldmode = _ref.oldmode,
-      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'formatConfig', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -477,7 +479,7 @@ var ajax = function ajax(_ref) {
     }
   }
   if (method === 'post' && format) {
-    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data);
+    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data, formatConfig);
     if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }

package/lib/wxlogin.js

@@ -193,6 +193,8 @@ var ajax = function ajax(_ref) {
       params = _ref$params === undefined ? {} : _ref$params,
       _ref$format = _ref.format,
       format = _ref$format === undefined ? true : _ref$format,
+      _ref$formatConfig = _ref.formatConfig,
+      formatConfig = _ref$formatConfig === undefined ? {} : _ref$formatConfig,
       _ref$mix = _ref.mix,
       mix = _ref$mix === undefined ? false : _ref$mix,
       _ref$defaults = _ref.defaults,
@@ -202,7 +204,7 @@ var ajax = function ajax(_ref) {
       secret = _ref.secret,
       encodes = _ref.encodes,
       oldmode = _ref.oldmode,
-      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'formatConfig', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -477,7 +479,7 @@ var ajax = function ajax(_ref) {
     }
   }
   if (method === 'post' && format) {
-    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data);
+    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data, formatConfig);
     if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }

package/package.json

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

package/packages/data-table/src/main.vue

@@ -356,7 +356,7 @@ export default {
     // 无数据时显示的文本
     emptyText: {
       type: String,
-      default: ''
+      default: '暂无数据'
     },
     // 是否开启合计行区域
     total: {

package/packages/flow/src/component/Circulate.vue

@@ -5,6 +5,7 @@
       :model="infoList"
       class=""
       label-width="120px"
+      :label-position="labelPosition"
     >
       <el-form-item
         v-if="isHideCurrentOrg == 0"
@@ -109,7 +110,11 @@ export default {
     simpleTips: { type: Boolean, default: true },
     showBtn: { type: Boolean, default: true },
     multiple: { type: Boolean, default: true },
-    selectorParams:{type:Object,default:()=>{}}
+    selectorParams:{type:Object,default:()=>{}},
+    labelPosition:{
+      type: String,
+      default: 'left'
+    },
   },
   inheritAttrs: false,
   data() {

package/packages/flow/src/main.vue

@@ -45,7 +45,7 @@
         :isBanInputOpinion="isBanInputOpinion"
         :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
       />
-      <el-form ref="form" :model="circulateForm" label-width="120px">
+      <el-form ref="form" :model="circulateForm" label-width="120px" :label-position="formLabelPosition">
         <el-form-item style="margin-top:20px" prop="nextNodeId" label="下步节点">
           <el-select
             v-if="nextNodeCheckType == 'select'"
@@ -67,6 +67,7 @@
       <circulate
         style="margin-top: 10px"
         :businessId="businessIds"
+        :label-position="formLabelPosition"
         ref="circulate"
         :selectorParams="params"
         :pending-id="pendingId"
@@ -161,6 +162,7 @@
         :model="isFlow ? nodeInfo : nextNode"
         class="demo-dynamic"
         label-width="120px"
+        :label-position="formLabelPosition"
       >
         <el-form-item
           prop="nextCurrentOrgObj"
@@ -172,8 +174,8 @@
             mix
             :disableds="currentOrgDisabledObjId"
             @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
-            :types="['employee', 'persongroup']"
-            :params="{ filid: userModel.orgId }"
+            :types="currentOrgSelectorTabs"
+            :params="currentOrgSelectorParams"
           />
         </el-form-item>
         <el-form-item
@@ -186,13 +188,10 @@
             mix
             :disableds="otherOrgDisabledObjId"
             @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
-            :types="['enterprise', 'filgroupobj']"
-            :params="{
-              filid: 'all',
-              roleid: circularReadParamsMap.circularReadOrgRoleCode
-            }"
-          /> </el-form-item
-      ></el-form>
+            :types="foreignOrgSelectorTabs"
+            :params="foreignOrgSelectorParams"
+          /> </el-form-item >
+    </el-form>
       <div
         v-show="
           (!endFlow || nodeInfos.length > 1) &&
@@ -207,6 +206,7 @@
           :model="isFlow ? nodeInfo : nextNode"
           class="demo-dynamic"
           label-width="120px"
+          :label-position="formLabelPosition"
         >
           <el-form-item
             v-if="isFlow && nodeInfo.option.length > 0"
@@ -336,6 +336,7 @@
                 prop="nextOperate"
                 label="下步操作"
                 v-if="isChooseNextNode == 1"
+                
                 :rules="[
                   { required: true, message: `请选择下步操作`, trigger: 'blur' }
                 ]"
@@ -486,8 +487,8 @@
                     mix
                     :disableds="currentOrgDisabledObjId"
                     @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
-                    :types="['department', 'employee']"
-                    :params="params"
+                    :types="currentOrgSelectorTabs"
+            :params="currentOrgSelectorParams"
                   />
                 </el-form-item>
                 <el-form-item
@@ -501,8 +502,8 @@
                     mix
                     :disableds="otherOrgDisabledObjId"
                     @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
-                    :types="['enterprise']"
-                    :params="{ filid: 'all' }"
+                    :types="foreignOrgSelectorTabs"
+            :params="foreignOrgSelectorParams"
                   />
                 </el-form-item>
                 <el-form-item
@@ -847,6 +848,7 @@
           :copy-history="freeStartFlowParams.pendedHistoryHandle"
           :process-definition-id="freeStartFlowNextNode || nodeInfo.nextNode"
           :opinion="value"
+          :taskExamineParam="freeStartFlowParams.newFlowStartNodeItemName"
           :taskParams="taskParams"
           :formType="processFormType"
           @cancel="closeProcess($event, 'handleVisible', closeParent)"
@@ -1052,6 +1054,10 @@ export default {
     defaultProcessKey: { type: String, default: '' },
     hideBtn: { type: Boolean, default: false },
     isCirculate: { type: Boolean, default: false },
+    formLabelPosition:{
+      type: String,
+      default: 'left'
+    },
     btnList: {
       type: Array,
       default: () => [
@@ -1092,6 +1098,10 @@ export default {
     return {
       styles: {},
       optionsKey: 0,
+      currentOrgSelectorParams:{filid:''},
+      currentOrgSelectorTabs:['employee', 'persongroup'],
+      foreignOrgSelectorTabs:['enterprise', 'filgroupobj'],
+      foreignOrgSelectorParams:{filid: 'all',roleid:''},
       showCirculate: undefined,
       circulateForm: { nextNodeId: '111' },
       userModel: {},
@@ -1280,6 +1290,7 @@ export default {
   },
   mounted() {
     this.businessIds = this.businessId;
+    this.currentOrgSelectorParams.filid = JSON.parse(util.getStorage('mainConfig')).userModel.orgId
     this.nextNode.nextNodeId = this.nextNodeId;
     if(!this.isFlow){
       this.getInfo();
@@ -2637,6 +2648,7 @@ export default {
                 nextNodeCheckType,
                 pOrgId,
                 currentOrgName,
+                currentOrgSelectorParams,
                 otherOrgName,
                 taskExamine,
                 nodeInfoMap,
@@ -2659,8 +2671,29 @@ export default {
             }
             this.$emit('startTaskRead', res);
             this.$emit('start-task-read', res);
+            if(currentOrgSelectorParams.enableCurrentOrgConfig == 'true'){
+              this.currentOrgSelectorTabs = currentOrgSelectorParams.currentOrgType.split(',');
+             let currentOrgparams = currentOrgSelectorParams.currentOrgRange.split(',')
+             this.currentOrgSelectorTabs.map((x,i) => {
+              this.currentOrgSelectorParams[x] = { filid: currentOrgparams[i]== 'my'
+                        ? choiceOrgId
+                        : param[i] };
+             })
+            }
+            if(currentOrgSelectorParams.enableForeignOrgConfig == 'true'){
+              this.foreignOrgSelectorTabs = currentOrgSelectorParams.foreignOrgType.split(',');
+              let foreignOrgparams = currentOrgSelectorParams.foreignOrgRange.split(',')
+                  this.foreignOrgSelectorTabs.map((x,i) => {
+              this.foreignOrgSelectorParams[x] = { filid: foreignOrgparams[i]== 'my'
+                        ? choiceOrgId
+                        : foreignOrgparams[i] };
+             })
+            }
             this.circularReadParamsMap = circularReadParamsMap || {};
-            this.currentOrgName = 
+            if(this.circularReadParamsMap.circularReadOrgRoleCode){
+              this.foreignOrgSelectorParams.roleid = this.circularReadParamsMap.circularReadOrgRoleCode
+            }
+            this.currentOrgName = currentOrgName
             this.nextOperateCheckType = nextOperateCheckType;
             this.currentNodeIsCircularReadNode =
               nodeInfoMap.nodeExtAttr.currentNodeIsCircularReadNode == 1;

package/packages/flow/src/processForm.vue

@@ -374,7 +374,11 @@ export default {
     taskParams: {
       type: Object,
       default: () => {}
-    }
+    },
+    taskExamineParam:{
+      type:String,
+      default: ''
+    },
   },
   data() {
     return {
@@ -721,6 +725,7 @@ export default {
             newParm.copyHistory = this.copyHistory === 'needCopyPendedHistory';
             newParm.startFlowParamJson = params;
             newParm.startFlowParamJson.businessId = this.id; //this.id
+            newParm.startFlowParamJson.taskExamineParam = {startFlowFirstNodeName:this.taskExamineParam}
             newParm.startFlowParamJson = JSON.stringify(
               newParm.startFlowParamJson
             );

package/packages/flow/src/selectUser.vue

@@ -186,7 +186,7 @@ export default {
   },
   computed:{
     newWhere(){
-      return {mid:`${JSON.parse(util.getStorage('mainConfig')).userModel.orgId}-org-1`,...this.where}
+      return {mid:`${JSON.parse(util.getStorage('mainConfig')).userModel.orgId}-org-1`,filid:JSON.parse(util.getStorage('mainConfig')).userModel.orgId,...this.where}
     }
   },
   watch: {

package/packages/flow-list/src/main.vue

@@ -24,11 +24,16 @@
           v-if="show"
           :class="{ 'es-flow-group-data-table': item.type !== 'sign' }"
           :display="display"
-          :numbers="numbers"
           @cell-click="handleCellClick"
           :full="height !== 'auto'"
           v-bind="item"
-          :data="showDoresult?returnData(item.type).filter(x => x.doresult || x.handleInfo) : returnData(item.type)"
+          :data="
+            showDoresult
+              ? returnData(item.type).filter(
+                  (x) => x.doresult || x.handleInfo || x.pendstate != 2
+                )
+              : returnData(item.type)
+          "
           @btn-click="handleBtnClick"
           @selection-change="handleSelectionChange"
         ></es-data-table>
@@ -408,7 +413,7 @@ export default {
     },
     theads() {
       const _that = this;
-      return {
+      let newThead = {
         flow: [
           {
             label: '经办部门',
@@ -1047,6 +1052,19 @@ export default {
           }
         ]
       };
+      if (this.numbers) {
+        for (let key in newThead) {
+          newThead[key].unshift({
+            label: '序号',
+            field: 'sort',
+            align: 'center',
+            key: 'xh',
+            showOverflowTooltip: true,
+            width: 50
+          });
+        }
+      }
+      return newThead;
     },
     content() {
       const _that = this;
@@ -1300,8 +1318,10 @@ export default {
       };
       util.ajax(params).then((res) => {
         if (res.status == 'success' || res.rCode == 0) {
-          
           _that.circularData = res.data.fyHistoryList;
+          _that.circularData.map((x, i) => {
+            x.sort = i + 1;
+          });
           _that.hasCircularReadWithdrawAuthority =
             res.data.hasCircularReadWithdrawAuthority;
           _that.$nextTick(() => {
@@ -1518,11 +1538,16 @@ export default {
         }
       };
       await util.ajax(params).then((res) => {
-      
         if (type == 1) {
           this.untreatedReadData = res.data;
+          this.untreatedReadData.map((x, i) => {
+            x.sort = i + 1;
+          });
         } else {
           this.processedReadData = res.data;
+          this.processedReadData.map((x, i) => {
+            x.sort = i + 1;
+          });
         }
       });
     },
@@ -1561,7 +1586,6 @@ export default {
           } = res;
           this.loading.close();
           if (status == 'success') {
-            
             this.flowTableInfo.adjunctCode = adjunctCode;
             this.flowTableInfo.hasAgent = hasAgent;
             this.attachmentPaperClipCssStyle =
@@ -1569,12 +1593,16 @@ export default {
             this.isShort = isShort;
             this.taskReadName = taskReadName;
             this.flowData = wfHistoryList;
-            this.flowData.map((x) => {
+            this.flowData.map((x, i) => {
+              x.sort = i + 1;
               if (!x.deptid) {
                 x.deptid = x.deptName;
               }
             });
             this.splitReadingData = fyHistoryList;
+            this.splitReadingData.map((x, i) => {
+              x.sort = i + 1;
+            });
             this.modify = modify;
             this.show = true;
             if (this.height == 'auto') {
@@ -1715,8 +1743,12 @@ export default {
           } = res;
           this.loading.close();
           if (status == 'success') {
-            
-            presetInfoList && (this.presetData = presetInfoList);
+            if (presetInfoList) {
+              this.presetData = presetInfoList;
+              this.presetData.map((x, i) => {
+                x.sort = i + 1;
+              });
+            }
             this.presetInfoListHiddenColumns = presetInfoListHiddenColumns;
             this.currentUserHasPresetInfoAuth = currentUserHasPresetInfoAuth;
             this.canDelete = canDelete;