eoss-mobiles 0.3.47 → 0.3.49
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/eoss-mobile.common.js +37 -34
- package/lib/flow.js +31 -28
- package/lib/index.js +1 -1
- package/package.json +1 -1
- package/packages/flow/src/components/Message.vue +0 -1
- package/packages/flow/src/components/TaskRead.vue +1 -1
- package/packages/flow/src/components/taskUnionExamine.vue +5 -2
- package/packages/flow/src/main.vue +1 -1
- package/src/index.js +1 -1
package/package.json
CHANGED
|
@@ -634,7 +634,7 @@ export default {
|
|
|
634
634
|
handleExplain: this.form.handleExplain,
|
|
635
635
|
currentOrgProcessKey: processDefinitionId,
|
|
636
636
|
noticeType: this.form.notificationMsgType,
|
|
637
|
-
taskAction:
|
|
637
|
+
taskAction:this.type== "taskReadAndEnd"? "taskReadAndEnd" : "create",
|
|
638
638
|
userId: this.userId,
|
|
639
639
|
// notificationMsg: this.form.notificationMsg,
|
|
640
640
|
nextReadUserId: ids
|
|
@@ -71,6 +71,7 @@
|
|
|
71
71
|
:baseUrl="apiBaseUrl"
|
|
72
72
|
:paddingTop="paddingTop"
|
|
73
73
|
:param="otherParams"
|
|
74
|
+
:disableds="otherOrgDisabledObjId"
|
|
74
75
|
isEnterprise
|
|
75
76
|
@change="changeSelectUser($event, 'nextOtherOrgObj')"
|
|
76
77
|
:label="otherOrgName ? otherOrgName : '外单位'"
|
|
@@ -155,6 +156,7 @@ export default {
|
|
|
155
156
|
notificationMessageReadOnly: false,
|
|
156
157
|
currentOrgTabs: [],
|
|
157
158
|
foreignOrgTabs: [],
|
|
159
|
+
otherOrgDisabledObjId: [],
|
|
158
160
|
showMessage:false,
|
|
159
161
|
file: '',
|
|
160
162
|
infoList: {
|
|
@@ -286,7 +288,6 @@ export default {
|
|
|
286
288
|
this.$toast.clear();
|
|
287
289
|
if (status === 'success') {
|
|
288
290
|
this.infoList.noticeType = message.split(',');
|
|
289
|
-
console.log( this.infoList.noticeType,' this.infoList.noticeType')
|
|
290
291
|
} else {
|
|
291
292
|
this.$toast(message || '系统错误，请联系管理员！');
|
|
292
293
|
}
|
|
@@ -407,7 +408,9 @@ export default {
|
|
|
407
408
|
}
|
|
408
409
|
}
|
|
409
410
|
} = res;
|
|
410
|
-
|
|
411
|
+
res.data.otherOrgDisabledObjId &&
|
|
412
|
+
(this.otherOrgDisabledObjId =
|
|
413
|
+
res.data.otherOrgDisabledObjId.split(','));
|
|
411
414
|
this.notificationMessageReadOnly =
|
|
412
415
|
notificationMessageReadOnly == 'true';
|
|
413
416
|
this.readOnlyNotificationType = readOnlyNotificationType;
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
:beforeSubmit="beforeSubmit"
|
|
23
23
|
/>
|
|
24
24
|
<TaskRead
|
|
25
|
-
v-else-if="newType === 'taskRead' || newType === 'transfer'"
|
|
25
|
+
v-else-if="newType === 'taskRead' || newType === 'transfer' || newType === 'taskReadAndEnd'"
|
|
26
26
|
v-bind="$attrs"
|
|
27
27
|
:userId="userId"
|
|
28
28
|
:type="newType"
|