eoss-mobiles 0.3.86 → 0.3.87

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

@@ -63,43 +63,45 @@
             </div>
           </div>
           <!-- 本单位-->
-              <!-- v-if="isHideCurrentOrg" -->
-              <div class="item" v-if="isHideCurrentOrg">
-                <em-selector
-                  v-model="nextCurrentOrgObjSelect"
-                  multiple
-                  :isAllCheck="isAllCheck"
-                  :paddingTop="paddingTop"
-                  isDepartment
-                  :objType="'enterprise'"
-                  :tabs="currentOrgSelectorTabs"
-                  :param="currentOrgSelectorParams"
-                  :disableds="currentOrgDisabledObjId"
-                  :baseUrl="apiBaseUrl"
-                  :isOtherUnit="false"
-                  :label="'本单位'"
-                  @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
-                />
-              </div>
-              <!-- 外单位 -->
-              <!-- v-if="isHideOtherOrg" -->
-              <div class="item" v-if="isHideOtherOrg">
-                <em-selector
-                  v-model="nextOtherOrgObjSelect"
-                  multiple
-                  :isAllCheck="isAllCheck"
-                  :paddingTop="paddingTop"
-                  :objType="'enterprise'"
-                  :param="foreignOrgSelectorParams"
-                  :tabs="foreignOrgSelectorTabs"
-                  :baseUrl="apiBaseUrl"
-                  :disableds="otherOrgDisabledObjId"
-                  :isOtherUnit="true"
-                  isEnterprise
-                  :label="'外单位'"
-                  @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
-                />
-              </div>
+          <!-- v-if="isHideCurrentOrg" -->
+          <div class="item" v-if="isHideCurrentOrg">
+            <em-selector
+              v-model="nextCurrentOrgObjSelect"
+              multiple
+              :isAllCheck="isAllCheck"
+              :paddingTop="paddingTop"
+              isDepartment
+              @selector-click="handleSelectorClick"
+              :objType="'enterprise'"
+              :tabs="currentOrgSelectorTabs"
+              :param="currentOrgSelectorParams"
+              :disableds="currentOrgDisabledObjId"
+              :baseUrl="apiBaseUrl"
+              :isOtherUnit="false"
+              :label="'本单位'"
+              @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
+            />
+          </div>
+          <!-- 外单位 -->
+          <!-- v-if="isHideOtherOrg" -->
+          <div class="item" v-if="isHideOtherOrg">
+            <em-selector
+              v-model="nextOtherOrgObjSelect"
+              multiple
+              :isAllCheck="isAllCheck"
+              :paddingTop="paddingTop"
+              :objType="'enterprise'"
+              @selector-click="handleSelectorClick"
+              :param="foreignOrgSelectorParams"
+              :tabs="foreignOrgSelectorTabs"
+              :baseUrl="apiBaseUrl"
+              :disableds="otherOrgDisabledObjId"
+              :isOtherUnit="true"
+              isEnterprise
+              :label="'外单位'"
+              @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
+            />
+          </div>
           <!--办理人 -->
           <div class="item item-two-line" v-if="isNextUser">
             <em-selector
@@ -108,6 +110,7 @@
               :isAllCheck="isAllCheck"
               required
               tabs="employee,persongroup"
+              @selector-click="handleSelectorClick"
               :param="{
                 pid: pid,
                 onlyMyOrg: onlyMyOrg
@@ -120,7 +123,7 @@
               :objType="objType"
               :nextUserList="nextUserList"
               @change="handleChange($event, 'nextUserSelectList')"
-              :label="`${flowLabelConfig.nextUser|| '办理人'}`"
+              :label="`${flowLabelConfig.nextUser || '办理人'}`"
             />
           </div>
           <div class="item" v-if="enableCustomLimitTimeSetting">
@@ -311,7 +314,7 @@ export default {
     hideMessage: {
       type: Boolean,
       default: false
-    },
+    }
   },
   data() {
     return {
@@ -322,17 +325,16 @@ export default {
       isCustomUser: 1,
       isHideCurrentOrg: false, //是否隐藏本单位(承办)
       isHideOtherOrg: false, //是否隐藏外单位(承办)
-       nextCurrentOrgObjSelect: [], // 选中本单位
+      nextCurrentOrgObjSelect: [], // 选中本单位
       nextOtherOrgObjSelect: [], //选中外单位
-      currentOrgSelectorParams: {only_filid: true,
-                  onlyMyOrg:true},
+      currentOrgSelectorParams: { only_filid: true, onlyMyOrg: true },
       currentOrgSelectorTabs: 'employee,persongroup',
       foreignOrgSelectorTabs: 'enterprise,filgroupobj',
       foreignOrgSelectorParams: { roleid: '' },
       otherOrgDisabledObjId: [],
       currentOrgDisabledObjId: [],
       isCurrentNodeForbiddenChangeCandidate: 0,
-      isNextUser:true,
+      isNextUser: true,
       form: {
         nextNodeId: undefined, // 流程节点id
         nextNodeName: undefined, // 流程节点名称
@@ -381,12 +383,14 @@ export default {
       ...this.foreignOrgSelectorParams,
       ...this.selectorParams
     };
-    if(this.orgId){
+    if (this.orgId) {
       this.currentOrgSelectorParams.pid = this.orgId;
-    }else if($.getStorage('orgId')){
+    } else if ($.getStorage('orgId')) {
       this.currentOrgSelectorParams.pid = $.getStorage('orgId');
-    }else if($.getStorage('userInfo')){
-      this.currentOrgSelectorParams.pid = JSON.parse($.getStorage('userInfo')).orgId;
+    } else if ($.getStorage('userInfo')) {
+      this.currentOrgSelectorParams.pid = JSON.parse(
+        $.getStorage('userInfo')
+      ).orgId;
     }
     let obj = {
       processDefinitionId: this.defId,
@@ -402,6 +406,9 @@ export default {
   },
 
   methods: {
+    handleSelectorClick(val) {
+      this.$parent.$emit('selector-click', val);
+    },
     goBack() {
       this.$parent.$emit('close');
       this.$emit('close');
@@ -473,7 +480,7 @@ export default {
       if (
         (this.isHideCurrentOrg || this.isHideOtherOrg) &&
         !this.form.nextCurrentOrgObjJson &&
-        !this.form.nextOtherOrgObjJson 
+        !this.form.nextOtherOrgObjJson
       ) {
         // this.$toast(`请选择${this.currentOrgName || '本单位'}`);
         this.$toast(`请选择办理对象`);
@@ -483,7 +490,7 @@ export default {
       //   this.$toast('请选择通知消息');
       //   return;
       // }
-      
+
       let info = {
         processDefinitionId: this.flowObj.processDefinitionId,
         nextUserId: this.form.nextUserId,
@@ -504,15 +511,15 @@ export default {
         userId: this.userId || $.getStorage('userId'),
         mobileKey: $.getStorage('deviceId') || '123'
       };
-      if(this.isHideCurrentOrg && this.form.nextCurrentOrgObj){
+      if (this.isHideCurrentOrg && this.form.nextCurrentOrgObj) {
         info.nextCurrentOrgObj = this.form.nextCurrentOrgObj;
       }
-      if(this.isHideOtherOrg && this.form.nextOtherOrgObj){
+      if (this.isHideOtherOrg && this.form.nextOtherOrgObj) {
         info.nextOtherOrgObj = this.form.nextOtherOrgObj;
       }
-      if(this.enableCustomLimitTimeSetting && !info.customLimitTime){
+      if (this.enableCustomLimitTimeSetting && !info.customLimitTime) {
         this.$toast(`请选择或填写限时办理时间`);
-        return
+        return;
       }
       if (!this.enableCustomLimitTimeSetting) {
         delete info.customLimitTime;
@@ -556,12 +563,12 @@ export default {
         info.businessId = this.businessId; //this.businessId
       }
       if (this.beforeSubmit) {
-        this.beforeSubmit(info,this.sendData);
+        this.beforeSubmit(info, this.sendData);
         return;
       }
       this.sendData(info);
     },
-    sendData(info){
+    sendData(info) {
       let formData = new FormData();
       // if (this.form.isImageOpinion == 1) {
       //   formData.append('file', this.file);
@@ -600,10 +607,10 @@ export default {
           if (_that.formType == 'freeStart' && !_that.isFreeStartFlow) {
             this.$emit('closePop');
           } else {
-            if(_that.formType == 'freeStart'){
+            if (_that.formType == 'freeStart') {
               _that.$emit('success');
-            }else{
-            _that.$parent.$emit('success');
+            } else {
+              _that.$parent.$emit('success');
             }
           }
         } else {
@@ -681,16 +688,15 @@ export default {
         );
         this.form.nextNodeId = nodeInfo[0].nodeId;
         this.form.nextNodeName = nodeInfo[0].nodeName;
-         nodeInfo[0].transactorInfos &&
-        (this.nextUserList = nodeInfo[0].transactorInfos);
+        nodeInfo[0].transactorInfos &&
+          (this.nextUserList = nodeInfo[0].transactorInfos);
       } else {
         this.form.nextNodeId = val.list[0].nodeId;
         this.form.nextNodeName = val.list[0].nodeName;
-         val.list[0].transactorInfos &&
-        (this.nextUserList = val.list[0].transactorInfos);
+        val.list[0].transactorInfos &&
+          (this.nextUserList = val.list[0].transactorInfos);
       }
 
-     
       this.nextUserSelectList = [];
       this.showNextList = false;
       this.getPeopleObj(this.form.nextNodeId);
@@ -700,8 +706,7 @@ export default {
       this.form.nextNodeId = val.nodeId;
       this.form.nextNodeName = val.nodeName;
       this.showNextNodeList = false;
-      val.transactorInfos &&
-        (this.nextUserList = val.transactorInfos);
+      val.transactorInfos && (this.nextUserList = val.transactorInfos);
       this.nextUserSelectList = [];
       this.getPeopleObj(this.form.nextNodeId);
     },
@@ -800,7 +805,8 @@ export default {
             let defaultNotificationTypes = [];
             if (
               res.results.notificationTypes &&
-              that.defaultNotificationType.length == 0 && !that.hideMessage
+              that.defaultNotificationType.length == 0 &&
+              !that.hideMessage
             ) {
               defaultNotificationTypes = res.results.notificationTypes.filter(
                 (x) => x.defaultSelected == 'true'
@@ -817,7 +823,7 @@ export default {
         });
       });
     },
-     // 单位选择完回调
+    // 单位选择完回调
     disposeAppUnit(res, type) {
       let label = type.substring(0, type.lastIndexOf('Select'));
       let idStr = '';
@@ -908,7 +914,10 @@ export default {
         if (res.rCode == 0) {
           _that.isCustomUser = res.results.nodeExtr.isCustomUser;
           _that.peopleObj = res.results.nodeExtr;
-           if (res.results.nodeExtr.nodeType === 1 || res.results.nodeExtr.nodeType === 2) {
+          if (
+            res.results.nodeExtr.nodeType === 1 ||
+            res.results.nodeExtr.nodeType === 2
+          ) {
             _that.isNextUser = false;
             _that.isHideCurrentOrg =
               res.results.nodeExtr.isHideCurrentOrg == 1 ? false : true; //判断是否隐藏本单位
@@ -925,8 +934,13 @@ export default {
           // _that.nextUserList = res.results.transactorInfos || [];
           _that.enableCustomLimitTimeSetting =
             this.peopleObj.enableCustomLimitTimeSetting == 1;
-          if(_that.enableCustomLimitTimeSetting && res.results.nodeMoreInfo && res.results.nodeMoreInfo.defaultCustomLimitDays){
-            _that.form.customLimitTime = res.results.nodeMoreInfo.defaultCustomLimitDays + '';
+          if (
+            _that.enableCustomLimitTimeSetting &&
+            res.results.nodeMoreInfo &&
+            res.results.nodeMoreInfo.defaultCustomLimitDays
+          ) {
+            _that.form.customLimitTime =
+              res.results.nodeMoreInfo.defaultCustomLimitDays + '';
           }
           if (res.results.nodeExtr.userSelectionType) {
             this.treeType = res.results.nodeExtr.userSelectionType;

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

@@ -23,6 +23,7 @@
             :isAllCheck="isAllCheck"
             :param="params"
             :baseUrl="apiBaseUrl"
+            @selector-click="handleSelectorClick"
             tabs="employee,persongroup"
             :paddingTop="paddingTop"
             v-model="nextReadUserSelectList"
@@ -36,6 +37,7 @@
             :multiple="multiple"
             tabs="employee,persongroup"
             :param="params"
+            @selector-click="handleSelectorClick"
             :isAllCheck="isAllCheck"
             :baseUrl="apiBaseUrl"
             :paddingTop="paddingTop"
@@ -79,7 +81,7 @@
           />
         </div>
         <Opinion
-        v-if="isSyncCopy"
+          v-if="isSyncCopy"
           :ownId="pendingId"
           @onInputOpintion="onInputOpintion"
           :isOpinionRequired="0"
@@ -96,7 +98,7 @@
         </div>
         <div class="item">
           <Message
-            v-if="!hideMessage "
+            v-if="!hideMessage"
             ref="message"
             :code="msgCode"
             :readOnlyNotificationType="readOnlyNotificationType"
@@ -213,7 +215,7 @@ export default {
     getSubText() {
       return this.processObj.rereadButtonName || '确定';
     },
-    
+
     params() {
       return {
         pid:
@@ -249,7 +251,10 @@ export default {
   },
 
   methods: {
-    onInputOpintion(val){
+    handleSelectorClick(val) {
+      this.$parent.$emit('selector-click', val);
+    },
+    onInputOpintion(val) {
       this.form.handleExplain = val.opinion;
     },
     //获取通知信息
@@ -500,8 +505,8 @@ export default {
         if (res.status == 'success' || res.rCode == 0) {
           this.selectPersonValue = res.data.selectPersonValue;
           this.isSyncCopy = res.data.isSyncCopy == 1;
-          if(res.data.taskHandleReadUserSelectLabelName){
-            this.radioData[1].name = res.data.taskHandleReadUserSelectLabelName
+          if (res.data.taskHandleReadUserSelectLabelName) {
+            this.radioData[1].name = res.data.taskHandleReadUserSelectLabelName;
           }
           this.isMultiple();
         }
@@ -628,10 +633,10 @@ export default {
         if (status == 'success') {
           this.defaultNotificationMessage = defaultNotificationMessage;
           this.form.notificationMsg = defaultNotificationMessage;
-          if(choiceDeptId){
+          if (choiceDeptId) {
             taskExamine.choiceDeptId = choiceDeptId;
           }
-          if(choiceOrgId){
+          if (choiceOrgId) {
             taskExamine.choiceOrgId = choiceOrgId;
           }
           this.taskExamine = taskExamine;
@@ -695,8 +700,8 @@ export default {
           nextReadUserId: ids
         }
       };
-      if(this.isSyncCopy && this.isSync ==1){
-        params.params.nextHandleReadUserId = params.params.nextReadUserId; 
+      if (this.isSyncCopy && this.isSync == 1) {
+        params.params.nextHandleReadUserId = params.params.nextReadUserId;
         delete params.params.nextReadUserId;
       }
       if (this.readParams) {

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

@@ -3,10 +3,15 @@
   <div class="process-start">
     <div class="startFlow-content">
       <!-- 当前节点 -->
-       <div style="border-radius: 5px;overflow: hidden;">
+      <div style="border-radius: 5px; overflow: hidden">
         <em-input v-model="title" label-width="90" label="标题" readonly />
-    <em-input v-model="processObj.nodeName" label-width="90" label="当前办理节点" readonly />
-       </div>
+        <em-input
+          v-model="processObj.nodeName"
+          label-width="90"
+          label="当前办理节点"
+          readonly
+        />
+      </div>
       <!-- 意见 -->
       <Opinion
         v-if="showOpinion"
@@ -51,6 +56,7 @@
               v-model="nextUserSelectList"
               :multiple="!isRadio"
               :isAllCheck="isAllCheck"
+              @selector-click="handleSelectorClick"
               required
               :param="{
                 pid: pid,
@@ -64,7 +70,7 @@
               :objType="objType"
               :nextUserList="nextUserList"
               @change="handleChange($event, 'nextUserSelectList')"
-              :label="`${flowLabelConfig.nextUser|| '办理人'}`"
+              :label="`${flowLabelConfig.nextUser || '办理人'}`"
             />
           </div>
           <div class="item" v-if="enableCustomLimitTimeSetting">
@@ -175,7 +181,7 @@ import {
   toTaskContinuationIndex,
   taskContinuation,
   getNotificationMsg,
-  findSysCodes,
+  findSysCodes
 } from '../../../../src/config/api';
 import request from '../../../../src/utils/http.js';
 import Opinion from './Opinion.vue';
@@ -247,11 +253,11 @@ export default {
     flowLabelConfig: {
       type: Object,
       default: () => ({})
-    },
+    }
   },
   data() {
     return {
-      title:'',
+      title: '',
       showOpinion: true,
       readOnlyNotificationType: '',
       notificationMessageReadOnly: false,
@@ -307,18 +313,21 @@ export default {
       // hideTempSave: true,
       businessId: this.businessId
     };
-    
+
     this.geAllData(obj);
     this.getDefNoticeType();
   },
 
   methods: {
+    handleSelectorClick(val) {
+      this.$parent.$emit('selector-click', val);
+    },
     getDefNoticeType() {
       request({
         url: findSysCodes
       }).then((res) => {
         // this.form.notificationMsg = res.message;
-        if(this.hideMessage) return
+        if (this.hideMessage) return;
         this.defaultNotificationType = res.message.split(',');
       });
     },
@@ -397,7 +406,7 @@ export default {
         return;
       }
       if (!this.form.nextUserId) {
-        this.$toast(`请选择${this.flowLabelConfig.nextUser|| '办理人'}`);
+        this.$toast(`请选择${this.flowLabelConfig.nextUser || '办理人'}`);
         return;
       }
       if (!this.form.nextNodeId) {
@@ -463,7 +472,10 @@ export default {
       });
       const _that = this;
       request({
-        url: (_that.apiBaseUrl || '') + _that.type === 'reset'?resetProcess:taskContinuation,
+        url:
+          (_that.apiBaseUrl || '') + _that.type === 'reset'
+            ? resetProcess
+            : taskContinuation,
         type: 'post',
         params: info,
         format: false
@@ -491,7 +503,7 @@ export default {
         this.$refs.selectTree.getContent(label);
       });
       let obj = {
-        label: `请选择${this.flowLabelConfig.nextUser|| '办理人'}`,
+        label: `请选择${this.flowLabelConfig.nextUser || '办理人'}`,
         show: true
       };
       this.$emit('informNav', obj);
@@ -574,19 +586,19 @@ export default {
     // 获取发起流程信息
     getProcessObj(res) {
       let that = this;
-      const url =that.type === 'reset' ? toResetProcessIndex : toTaskContinuationIndex
+      const url =
+        that.type === 'reset' ? toResetProcessIndex : toTaskContinuationIndex;
       return new Promise(function (resolve, reiect) {
         request({
-          url: that.apiBaseUrl
-            ? that.apiBaseUrl + url
-            : url,
+          url: that.apiBaseUrl ? that.apiBaseUrl + url : url,
           params: {
             appId: that.appId,
             userId: that.userId || $.getStorage('userId')
           }
         }).then((res) => {
           if (res.rCode == 0 || res.status == 'success') {
-            that.title = res.data.pendtitle || res.data.taskExamine.businessName
+            that.title =
+              res.data.pendtitle || res.data.taskExamine.businessName;
             that.isCurrentNodeForbiddenChangeCandidate =
               res.data.nodeInfoMap.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
             that.processObj = res.data.taskExamine;
@@ -608,7 +620,7 @@ export default {
                 that.nodeList.push({ nodeName: obj[key], nodeId: key });
               }
             }
-              if (res.data.taskNodeList && res.data.taskNodeList.length > 0) {
+            if (res.data.taskNodeList && res.data.taskNodeList.length > 0) {
               for (let key in res.data.taskNodeList[0]) {
                 that.nodeList.push({
                   nodeName: res.data.taskNodeList[0][key],
@@ -650,14 +662,19 @@ export default {
       request({
         url: _that.apiBaseUrl ? _that.apiBaseUrl + getNodeInfo : getNodeInfo,
         params: {
-           processDefinitionId: this.processObj.processDefinitionId,
+          processDefinitionId: this.processObj.processDefinitionId,
           // nextNodeId: res,
           nodeId: res,
           businessId: this.processObj.businessId,
           // taskId: this.processObj.taskId,
           pendingId: this.processObj.pendingId,
           userId: _that.userId,
-          taskAction: _that.type == 'reset' ? 'resetProcess' : _that.type == 'continuation' ? 'continuation' : ''
+          taskAction:
+            _that.type == 'reset'
+              ? 'resetProcess'
+              : _that.type == 'continuation'
+              ? 'continuation'
+              : ''
         }
       }).then((res) => {
         this.$toast.clear();
@@ -672,8 +689,13 @@ export default {
           });
           _that.enableCustomLimitTimeSetting =
             this.peopleObj.enableCustomLimitTimeSetting == 1;
-          if(_that.enableCustomLimitTimeSetting && res.data.nodeMoreInfo && res.data.nodeMoreInfo.defaultCustomLimitDays){
-            _that.form.customLimitTime = res.data.nodeMoreInfo.defaultCustomLimitDays + '';
+          if (
+            _that.enableCustomLimitTimeSetting &&
+            res.data.nodeMoreInfo &&
+            res.data.nodeMoreInfo.defaultCustomLimitDays
+          ) {
+            _that.form.customLimitTime =
+              res.data.nodeMoreInfo.defaultCustomLimitDays + '';
           }
           if (res.data.nodeExtAttr.userSelectionType) {
             this.treeType = res.data.nodeExtAttr.userSelectionType;