eoss-mobiles 0.3.81 → 0.3.83

package/package.json

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

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

@@ -593,7 +593,7 @@
       </div>
       <div v-else-if="showFlowBtn" class="btn-list">
         <div class="btn" @click="navigateBack">取消</div>
-        <div class="btn" @click="onSubmit()">{{submitButtonName || 确定}}</div>
+        <div class="btn" @click="onSubmit()">{{submitButtonName || '确定'}}</div>
       </div>
     </div>
     <Reject
@@ -888,6 +888,8 @@ export default {
   created() {
     // 获取用户信息
     // 生成时间数组
+    this.currentOrgSelectorParams={pid:this.orgId}
+    console.log(this.currentOrgSelectorParams,'this.currentOrgSelectorParams')
     this.timeList = new Array();
     for (let i = 0; i < 25; i++) {
       this.timeList.push(i);

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

@@ -31,7 +31,7 @@
         </div>
         <div class="item" v-if="taskReadType === '分阅' && type != 'transfer'">
           <em-selector
-            label="分阅人员"
+            :label="isSyncCopy ? '接收人' : '分阅人员'"
             required
             :multiple="multiple"
             tabs="employee,persongroup"
@@ -43,6 +43,19 @@
             @change="disposeAppUser"
           />
         </div>
+        <div class="item" v-if="isSyncCopy">
+          <em-input label="分阅模式" readonly>
+            <template slot="input">
+              <div class="template-input-two" style="width: 100%">
+                <em-radio-group
+                  v-model="isSync"
+                  :data="radioData"
+                  direction="horizontal"
+                />
+              </div>
+            </template>
+          </em-input>
+        </div>
         <div class="item" v-if="taskReadType === '阅结'">
           <em-input
             readonly
@@ -77,7 +90,7 @@
         </div>
         <div class="item">
           <Message
-          v-if="!hideMessage"
+            v-if="!hideMessage"
             ref="message"
             :code="msgCode"
             :readOnlyNotificationType="readOnlyNotificationType"
@@ -118,9 +131,15 @@ export default {
   data() {
     return {
       nextNode: {},
+      isSync: '0',
+      radioData: [
+        { name: '普通分阅', value: '0' },
+        { name: '同步办理', value: '1' }
+      ],
+      isSyncCopy: false,
       readOnlyNotificationType: '',
       defaultNotificationMessage: '',
-      selectPersonValue:0,
+      selectPersonValue: 0,
       notificationMessageReadOnly: false,
       dataJson: {
         isCdjxjTaskHandle: undefined
@@ -184,7 +203,7 @@ export default {
   },
   computed: {
     getSubText() {
-      return this.processObj.rereadButtonName || '确定'
+      return this.processObj.rereadButtonName || '确定';
     },
     params() {
       return {
@@ -210,9 +229,9 @@ export default {
     //   this.getProcessObjNew();
     // }
     this.getFind();
-    request({url:findUserBaseInfo}).then(res => {
-      console.log(res)
-    })
+    request({ url: findUserBaseInfo }).then((res) => {
+      console.log(res);
+    });
     if (!this.readParams) {
       this.getHandleInfoHtml();
     } else {
@@ -306,7 +325,7 @@ export default {
         .then((res) => {
           const { status, message, data } = res;
           if (status === 'success') {
-            if(this.hideMessage) return
+            if (this.hideMessage) return;
             this.form.notificationMsgType = message.split(',');
             this.defaultNotificationType = message.split(',');
             if (data) {
@@ -437,13 +456,13 @@ export default {
       } else if (this.selectPersonValue == 6) {
         this.multiple = true;
         this.params.pid = 'root';
-      }else if(this.selectPersonValue == 7){
-        this.multiple = false
-        this.params.pid = orgId
-      }else if(this.selectPersonValue == 8){
-        this.multiple = true
-        this.params.pid = orgId
-      }else{
+      } else if (this.selectPersonValue == 7) {
+        this.multiple = false;
+        this.params.pid = orgId;
+      } else if (this.selectPersonValue == 8) {
+        this.multiple = true;
+        this.params.pid = orgId;
+      } else {
         this.params.pid = 'root';
       }
     },
@@ -452,25 +471,29 @@ export default {
       this.form.notificationMsgType = obj.notificationType.join(',');
       this.form.notificationMsg = obj.notificationMsg;
     },
-    getTaskRead(){
-       let params = {
+    getTaskRead() {
+      let params = {
         appId: this.processObj.taskExamine.appId,
         businessId: this.processObj.taskExamine.businessId,
         // taskAction: this.newType,
         userId: this.userId,
         mobileKey: util.getStorage('deviceId') || '123'
       };
-       request({
+      request({
         url: this.baseUrl
           ? this.baseUrl + toStartTaskReadNew
           : toStartTaskReadNew,
         params: params
       }).then((res) => {
-        if(res.status == 'success' || res.rCode == 0){
-          this.selectPersonValue = res.data.selectPersonValue
-          this.isMultiple()
-        } 
-      })
+        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
+          }
+          this.isMultiple();
+        }
+      });
     },
     getProcessObjNew() {
       const _that = this;
@@ -494,7 +517,7 @@ export default {
           // this.notificationMsgType = res.data.defaultNotificationType.split(',');
           // this.isMultiple()
 
-          this.getTaskRead()
+          this.getTaskRead();
           // this.taskExamine = res.data.taskExamine;
           // console.log(this.taskExamine, 'taskExaminetaskExaminetaskExamine');
         } else {
@@ -589,7 +612,7 @@ export default {
             defaultNotificationMessage
           }
         } = res;
-        console.log(status,'来了')
+        console.log(status, '来了');
         if (status == 'success') {
           this.defaultNotificationMessage = defaultNotificationMessage;
           this.form.notificationMsg = defaultNotificationMessage;
@@ -636,7 +659,7 @@ export default {
         params: {
           ...this.form,
           pendingId: this.pendingId,
-          appId,
+          appId: appId || this.appid,
           businessId,
           choiceDeptId,
           choiceOrgId,
@@ -649,12 +672,17 @@ export default {
           handleExplain: this.form.handleExplain,
           currentOrgProcessKey: processDefinitionId,
           noticeType: this.form.notificationMsgType,
-          taskAction:this.type== "taskReadAndEnd"? "taskReadAndEnd" : "create",
+          taskAction:
+            this.type == 'taskReadAndEnd' ? 'taskReadAndEnd' : 'create',
           userId: this.userId,
           // notificationMsg: this.form.notificationMsg,
           nextReadUserId: ids
         }
       };
+      if(this.isSyncCopy && this.isSync ==1){
+        params.params.nextHandleReadUserId = params.params.nextReadUserId; 
+        delete params.params.nextReadUserId;
+      }
       if (this.readParams) {
         params.params = { ...params.params, ...this.readParams };
       }

package/src/index.js

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