eoss-mobiles 0.3.35 → 0.3.37

package/lib/selector.js

@@ -2264,8 +2264,8 @@ render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=17308961
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=ed62cd92
-var selector_treevue_type_template_id_ed62cd92_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=1c4984fc
+var selector_treevue_type_template_id_1c4984fc_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2445,11 +2445,11 @@ var selector_treevue_type_template_id_ed62cd92_render = function () {
     1
   )
 }
-var selector_treevue_type_template_id_ed62cd92_staticRenderFns = []
-selector_treevue_type_template_id_ed62cd92_render._withStripped = true
+var selector_treevue_type_template_id_1c4984fc_staticRenderFns = []
+selector_treevue_type_template_id_1c4984fc_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=ed62cd92
+// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=1c4984fc
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/tree.vue?vue&type=template&id=d9c99060
 var treevue_type_template_id_d9c99060_render = function () {
@@ -4020,10 +4020,14 @@ var _props, _methods;
       this.newParam = _extends({}, JSON.parse(JSON.stringify(this.param)));
       this.newParam.selecttype = this.newTabs[this.selectIndex].param.selecttype;
       if (this.newParam.selecttype === 'persongroup') {
-        this.newParam.pid = 'root';
+        if (this.newParam[this.newTabs[this.selectIndex].name]) {
+          this.newParam = _extends({}, this.newTabs[this.selectIndex].param, this.newParam[this.newTabs[this.selectIndex].name] ? this.newParam[this.newTabs[this.selectIndex].name] : {});
+        } else {
+          this.newParam.pid = 'root';
+        }
         this.newParam.myUserid = this.newParam.myUserid || util["a" /* default */].getStorage('userId');
       } else {
-        this.newParam = _extends({}, this.newTabs[this.selectIndex].param, this.newParam);
+        this.newParam = _extends({}, this.newTabs[this.selectIndex].param, this.newParam[this.newTabs[this.selectIndex].name] ? this.newParam[this.newTabs[this.selectIndex].name] : {});
         //  this.newTabs[this.selectIndex].param.pid || this.param.pid || 'root';
       }
       delete this.newParam.department;
@@ -4348,8 +4352,8 @@ var _props, _methods;
 
 var selector_tree_component = Object(componentNormalizer["a" /* default */])(
   src_selector_treevue_type_script_lang_js,
-  selector_treevue_type_template_id_ed62cd92_render,
-  selector_treevue_type_template_id_ed62cd92_staticRenderFns,
+  selector_treevue_type_template_id_1c4984fc_render,
+  selector_treevue_type_template_id_1c4984fc_staticRenderFns,
   false,
   null,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.3.35",
+  "version": "0.3.37",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

package/packages/field/src/main.vue

@@ -28,6 +28,7 @@
       :required="
         required || (Array.isArray(rules) ? rules[0].required : rules.required)
       "
+      :autofocus="autofocus"
       :error="
         (!newErrorMessage &&
           !modelValue &&
@@ -109,6 +110,10 @@ export default {
       type: String,
       default: ''
     },
+    autofocus: {
+      type: Boolean,
+      default: false
+    },
     labelPosition: {
       type: String,
       default: 'left'

package/packages/flow/src/components/Handle.vue

@@ -42,7 +42,9 @@
             isForceDisplayDefaultOptionForPrefix
           "
           :pendingItemHandleDescription="pendingItemHandleDescription"
-          :placeholder="pendingItemHandleDescription || opinionHandleExplainText"
+          :placeholder="
+            pendingItemHandleDescription || opinionHandleExplainText
+          "
           :nodeDefaultSubmitOpinion="nodeDefaultSubmitOpinion"
           :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
           :isHiddenOftenOpinion="isHiddenOftenOpinion == 1 ? false : true"
@@ -285,11 +287,8 @@
                   :paddingTop="paddingTop"
                   isDepartment
                   :objType="'enterprise'"
-                  :tabs="'department,myemployee'"
-                  :param="{
-                    department: { pid: orgId, roleid: deptRoleCode },
-                    myemployee: { pid: orgId, roleid: deptRoleCode }
-                  }"
+                  :tabs="currentOrgSelectorTabs"
+                  :param="currentOrgSelectorParams"
                   :disableds="currentOrgDisabledObjId"
                   :baseUrl="apiBaseUrl"
                   :isOtherUnit="false"
@@ -306,10 +305,8 @@
                   :isAllCheck="isAllCheck"
                   :paddingTop="paddingTop"
                   :objType="'enterprise'"
-                  :param="{
-                    pid: 'root'
-                  }"
-                  :tabs="'enterprise'"
+                  :param="foreignOrgSelectorParams"
+                  :tabs="foreignOrgSelectorTabs"
                   :baseUrl="apiBaseUrl"
                   :disableds="otherOrgDisabledObjId"
                   :isOtherUnit="true"
@@ -668,11 +665,15 @@ export default {
         { name: '前置加签', value: 'preAddSign' },
         { name: '后置加签', value: 'postAddSign' }
       ],
+      currentOrgSelectorParams: { pid: 'root' },
+      currentOrgSelectorTabs: 'employee, persongroup',
+      foreignOrgSelectorTabs: 'enterprise,filgroupobj',
+      foreignOrgSelectorParams: { pid: 'root', roleid: '' },
       otherOrgDisabledObjId: [],
       currentNodeEnableItemHandleDescription: false,
       pendingItemHandleDescription: '',
-      taskOperationShiftedNodeList:null,
-      oldNextOperate:'',
+      taskOperationShiftedNodeList: null,
+      oldNextOperate: '',
       processFormType: 'freeStart',
       currentOrgDisabledObjId: [],
       nextNodeDefault: 0,
@@ -1146,11 +1147,12 @@ export default {
         return;
       }
       if (
-        this.isHideCurrentOrg &&
-        !this.form.nextCurrentOrgObjJson &&
+        (this.isHideCurrentOrg || this.isHideOtherOrg) &&
+        !this.form.nextCurrentOrgObjJson && !this.form.nextOtherOrgObjJson &&
         this.form.isAddSign != '1'
       ) {
-        this.$toast(`请选择${this.currentOrgName || '本单位'}`);
+        // this.$toast(`请选择${this.currentOrgName || '本单位'}`);
+        this.$toast(`请选择办理对象`);
         return;
       }
       delete this.form.nextNodeName;
@@ -1219,10 +1221,16 @@ export default {
       // _that.form.userId = 'u3a0bc559d4cf4f6ea47106ed7e76cae6';
       _that.form.mobileKey = $.getStorage('deviceId') || '123';
       _that.form.nextNodeId =
-        _that.form.nextOperate == 0 || _that.form.nextOperate == 1 || _that.oldNextOperate === 0 || _that.oldNextOperate === 1
+        _that.form.nextOperate == 0 ||
+        _that.form.nextOperate == 1 ||
+        _that.oldNextOperate === 0 ||
+        _that.oldNextOperate === 1
           ? _that.form.nextNodeId || nodeInfoMapInfo.nodeExtAttr.defaultNextNode
           : '';
-       _that.form.nextOperate = _that.oldNextOperate !== '' ? _that.oldNextOperate : _that.form.nextOperate;
+      _that.form.nextOperate =
+        _that.oldNextOperate !== ''
+          ? _that.oldNextOperate
+          : _that.form.nextOperate;
       if (!_that.isCanPreAddSign || _that.form.isAddSign != '1') {
         delete _that.form.addSignMode;
       }
@@ -1391,26 +1399,28 @@ export default {
         } else {
         }
       }
-      if(this.taskOperationShiftedNodeList && !val.isNextNode){
-        this.nodeList = this.nodeList.filter(x => this.taskOperationShiftedNodeList.indexOf(x.nodeId) == -1)
+      if (this.taskOperationShiftedNodeList && !val.isNextNode) {
+        this.nodeList = this.nodeList.filter(
+          (x) => this.taskOperationShiftedNodeList.indexOf(x.nodeId) == -1
+        );
       }
-      if(val.isNextNode){
-        this.oldNextOperate = val.nextOperate
-      }else{
-        this.oldNextOperate = ''
+      if (val.isNextNode) {
+        this.oldNextOperate = val.nextOperate;
+      } else {
+        this.oldNextOperate = '';
       }
-      if(val.isNextNode){
+      if (val.isNextNode) {
         this.nodeInfos = [];
         this.form.nextNodeId = val.key;
         this.form.nextNodeName = val.value;
-         this.$toast.loading({
+        this.$toast.loading({
           message: '加载中...',
           forbidClick: true,
           loadingType: 'spinner',
           overlay: true,
           duration: 0
         });
-        
+
         this.getNodeObj(this.form.nextNodeId);
       }
       if (this.nodeList && this.nodeList.length > 0) {
@@ -1424,7 +1434,7 @@ export default {
           this.form.nextNodeId = this.nodeList[0].nodeId;
           this.form.nextNodeName = this.nodeList[0].nodeName;
         }
-        
+
         this.$toast.loading({
           message: '加载中...',
           forbidClick: true,
@@ -1432,7 +1442,7 @@ export default {
           overlay: true,
           duration: 0
         });
-        
+
         if (isDef !== true) this.getNodeObj(this.form.nextNodeId);
       }
 
@@ -1575,6 +1585,7 @@ export default {
                 taskExamine,
                 customPresetHintMessage,
                 currentOrgName,
+                currentOrgSelectorParams,
                 notificationMessageReadOnly,
                 readOnlyNotificationType,
                 otherOrgName,
@@ -1586,12 +1597,47 @@ export default {
                 isCanPreAddSign
               }
             } = res;
-            if(taskOperationShiftedNodeList && taskOperationShiftedNodeList.length>0){
-              that.taskOperationShiftedNodeList = []
-              taskOperationShiftedNodeList.map(x =>{
-                that.taskOperationShiftedNodeList.push(x.nodeId) 
-                that.taskOperations.push({key: x.nodeId, value: x.nodeName,isNextNode: true,nextOperate:x.nextOperate,})
-              })
+            if (currentOrgSelectorParams.enableCurrentOrgConfig == 'true') {
+              that.currentOrgSelectorTabs =
+                currentOrgSelectorParams.currentOrgType.split(',');
+              let currentOrgparams =
+                currentOrgSelectorParams.currentOrgRange.split(',');
+              that.currentOrgSelectorTabs.map((x, i) => {
+                that.currentOrgSelectorParams[x] = {
+                  pid: currentOrgparams[i] == 'my' ? choiceOrgId : currentOrgparams[i]
+                };
+              });
+              that.currentOrgSelectorTabs = that.currentOrgSelectorTabs.join(',')
+            }
+            if (currentOrgSelectorParams.enableForeignOrgConfig == 'true') {
+              that.foreignOrgSelectorTabs =
+                currentOrgSelectorParams.foreignOrgType.split(',');
+              let foreignOrgparams =
+                currentOrgSelectorParams.foreignOrgRange.split(',');
+              that.foreignOrgSelectorTabs.map((x, i) => {
+                that.foreignOrgSelectorParams[x] = {
+                  pid:
+                    foreignOrgparams[i] == 'my'
+                      ? choiceOrgId
+                      : foreignOrgparams[i]
+                };
+              });
+              that.foreignOrgSelectorTabs = that.foreignOrgSelectorTabs.join(',')
+            }
+            if (
+              taskOperationShiftedNodeList &&
+              taskOperationShiftedNodeList.length > 0
+            ) {
+              that.taskOperationShiftedNodeList = [];
+              taskOperationShiftedNodeList.map((x) => {
+                that.taskOperationShiftedNodeList.push(x.nodeId);
+                that.taskOperations.push({
+                  key: x.nodeId,
+                  value: x.nodeName,
+                  isNextNode: true,
+                  nextOperate: x.nextOperate
+                });
+              });
             }
             that.pendingItemHandleDescription = pendingItemHandleDescription;
             nextNodeCheckType && (that.nextNodeCheckType = nextNodeCheckType);
@@ -1630,7 +1676,10 @@ export default {
             }
             that.isSpecial = res.data.isSpecial;
             that.processObj = res.data;
-            that.taskOperations = [...res.data.taskOperations,...that.taskOperations];
+            that.taskOperations = [
+              ...res.data.taskOperations,
+              ...that.taskOperations
+            ];
             if (that.taskOperations && that.taskOperations.length > 0) {
               let isSelected = false;
               that.taskOperations.map((item) => {

package/packages/flow/src/components/Opinion.vue

@@ -26,7 +26,6 @@
                 :placeholder="placeholder"
                 v-model="opinion"
                 ref="opinionInp"
-                :autofocus="pendingItemHandleDescription && showDescription"
                 type="textarea"
                 rows="3"
                 @input="onInput"
@@ -54,7 +53,6 @@
             ref="opinionInp"
             type="textarea"
             rows="3"
-            :autofocus="pendingItemHandleDescription && showDescription"
             @focus="handleFocus"
             @blur="handleBlur"
             @input="onInput"
@@ -237,7 +235,7 @@ export default {
           })
           .then(() => {
             this.opinion = this.pendingItemHandleDescription;
-           this.$refs.opinionInp[0].$children[0].focus();
+            this.$refs.opinionInp[0].$children[0].focus();
           })
           .catch(() => {
             // on cancel
@@ -246,7 +244,7 @@ export default {
       }
     },
     handleBlur() {
-      this.showDescription = !this.showDescription
+      this.showDescription = !this.showDescription;
     },
 
     handleSave(info) {

package/packages/selector/src/selector-tree.vue

@@ -742,11 +742,15 @@ export default {
       this.newParam.selecttype =
         this.newTabs[this.selectIndex].param.selecttype;
       if (this.newParam.selecttype === 'persongroup') {
-        this.newParam.pid = 'root';
+        if(this.newParam[this.newTabs[this.selectIndex].name]){
+           this.newParam = {...this.newTabs[this.selectIndex].param,...this.newParam[this.newTabs[this.selectIndex].name]?this.newParam[this.newTabs[this.selectIndex].name]:{}}
+        }else{
+          this.newParam.pid = 'root';
+        }
         this.newParam.myUserid =
           this.newParam.myUserid || $.getStorage('userId');
       } else {
-        this.newParam = {...this.newTabs[this.selectIndex].param,...this.newParam}
+        this.newParam = {...this.newTabs[this.selectIndex].param,...this.newParam[this.newTabs[this.selectIndex].name]?this.newParam[this.newTabs[this.selectIndex].name]:{}}
         //  this.newTabs[this.selectIndex].param.pid || this.param.pid || 'root';
       }
       delete this.newParam.department

package/src/index.js

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