@steedos-labs/content-compliance-bev 0.0.19 → 0.0.20
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/dist/index.js +1 -1
- package/lib/actions/spotCheckMaterial.js +4 -4
- package/lib/methods/approval_engine.js +5 -5
- package/lib/methods/notification.js +1 -1
- package/main/default/applications/pepsico_content_review.app.yml +6 -0
- package/main/default/client/pepsico_content.client.js +1 -1
- package/main/default/dashboards//345/256/241/346/240/270/344/272/272/347/234/213/346/235/277.dashboard.yml +2 -2
- package/main/default/objects/pepsico_approval_process/fields/current_step.field.yml +2 -2
- package/main/default/objects/pepsico_approval_process/fields/type.field.yml +1 -1
- package/main/default/objects/pepsico_approval_task/fields/approval_field.field.yml +1 -1
- package/main/default/objects/pepsico_flow_rule/fields/name.field.yml +2 -2
- package/main/default/objects/pepsico_material/buttons/pepsico_material_spot_check.button.yml +1 -1
- package/main/default/objects/pepsico_material/fields/approval_status.field.yml +1 -1
- package/main/default/objects/pepsico_material/fields/classification.field.yml +1 -1
- package/main/default/objects/pepsico_material/fields/guding_spot_check.field.yml +1 -1
- package/main/default/objects/pepsico_material/fields/guding_spot_check_user.field.yml +1 -1
- package/main/default/objects/pepsico_material/fields/spot_check_type.field.yml +2 -2
- package/main/default/objects/pepsico_material/fields/supplement_materials.field.yml +1 -1
- package/main/default/objects/pepsico_material/listviews/kol_midtier.listview.yml +0 -3
- package/main/default/objects/pepsico_material/listviews/spot_check.listview.yml +0 -3
- package/main/default/objects/pepsico_material_approval/buttons/pepsico_confirm_online.button.yml +3 -3
- package/main/default/objects/pepsico_material_approval/buttons/pepsico_postpone_online.button.yml +4 -4
- package/main/default/objects/pepsico_material_approval/fields/approval_materials_quantity.field.yml +1 -1
- package/main/default/objects/pepsico_material_approval/fields/approval_status.field.yml +1 -1
- package/main/default/objects/pepsico_material_approval/fields/approval_type.field.yml +2 -2
- package/main/default/objects/pepsico_material_approval/fields/assistance.field.yml +1 -1
- package/main/default/objects/pepsico_material_approval/fields/aunch_time.field.yml +2 -2
- package/main/default/objects/pepsico_material_approval/fields/current_step.field.yml +2 -2
- package/main/default/objects/pepsico_material_approval/fields/handler_guding.field.yml +1 -1
- package/main/default/objects/pepsico_material_approval/fields/launch.field.yml +5 -5
- package/main/default/objects/pepsico_material_approval/fields/postpone_launch_date.field.yml +2 -2
- package/main/default/objects/pepsico_material_approval/fields/reviewer.field.yml +1 -1
- package/main/default/objects/pepsico_material_approval/fields/special_spot_check.field.yml +1 -1
- package/main/default/objects/pepsico_material_approval/pepsico_material_approval.object.yml +1 -1
- package/main/default/objects/pepsico_material_approval_data/fields/guding_approve_times.field.yml +1 -1
- package/main/default/objects/pepsico_material_approval_data/fields/guding_pass.field.yml +1 -1
- package/main/default/objects/pepsico_material_approval_data/fields/material_approve_org.field.yml +1 -1
- package/main/default/objects/pepsico_material_data/fields/guding_pass.field.yml +1 -1
- package/main/default/objects/pepsico_material_data/fields/material_approve_org.field.yml +1 -1
- package/main/default/objects/pepsico_material_spot_check/fields/role.field.yml +2 -2
- package/main/default/objects/pepsico_reviewer/fields/assistance.field.yml +1 -1
- package/main/default/objects/pepsico_reviewer/fields/classification.field.yml +1 -1
- package/main/default/objects/pepsico_reviewer/fields/reviewer.field.yml +1 -1
- package/main/default/objects/pepsico_reviewer/fields/special_spot_check.field.yml +1 -1
- package/main/default/objects/pepsico_reviewer/listviews/all.listview.yml +0 -3
- package/main/default/objects/pepsico_tag_increase/listviews/all.listview.yml +1 -1
- package/main/default/objects/space_users/fields/password_expired.field.yml +1 -1
- package/main/default/objects/space_users/fields/role.field.yml +23 -0
- package/main/default/objects/space_users/listviews/all_users.listview.yml +1 -5
- package/main/default/pages/pepsico_content_review_detail.page.amis.json +2 -2
- package/main/default/questions//{345/233/272/345/256/232 → 344/270/223/345/221/230}/345/256/241/346/240/270/345/223/201/347/211/214/346/265/201/347/250/213/345/256/241/346/240/270/346/203/205/345/206/265.question.yml +1 -1
- package/main/default/questions//{345/233/272/345/256/232 → 344/270/223/345/221/230}/345/256/241/346/240/270/347/264/240/346/235/220/347/261/273/345/236/213/347/273/237/350/256/241.question.yml +1 -1
- package/main/default/questions//{345/233/272/345/256/232 → 344/270/223/345/221/230}/345/256/241/346/240/270/351/200/232/350/277/207/347/216/207.question.yml +2 -2
- package/main/default/questions//345/276/205/344/{270/212/347/272/277 → 274/240/350/276/223}/346/265/201/347/250/213/346/225/260.question.yml +1 -1
- package/main/default/questions//345/276/205/346/225/260/346/215/256/344/274/240/350/276/223/346/265/201/347/250/213/346/225/260.question.yml +38 -0
- package/main/default/tabs/pepsico_material_kanban_fqr.tab.yml +10 -2
- package/main/default/triggers/pepsico_material_approval_change.trigger.yml +1 -1
- package/package.json +1 -1
|
@@ -110,10 +110,10 @@ exports.spotCheckMaterial = {
|
|
|
110
110
|
checkUsers = '';
|
|
111
111
|
spot_checked_done = false;
|
|
112
112
|
spot_checked_done_time = null;
|
|
113
|
-
if (!(material.spot_check_type === '
|
|
114
|
-
if (material.spot_check_type === '
|
|
113
|
+
if (!(material.spot_check_type === '审核专员抽查' || material.spot_check_type === '四部门抽查')) return [3, 8];
|
|
114
|
+
if (material.spot_check_type === '审核专员抽查') {
|
|
115
115
|
if (material.guding_spot_check != true && (0, lodash_1.includes)(material.guding_spot_check_user, user.userId)) {
|
|
116
|
-
checkRole = '
|
|
116
|
+
checkRole = '审核专员';
|
|
117
117
|
checkField = 'guding_spot_check';
|
|
118
118
|
checkUsers = 'guding_spot_check_user';
|
|
119
119
|
spot_checked_done = true;
|
|
@@ -942,7 +942,7 @@ exports.generateSpotCheckPool = {
|
|
|
942
942
|
return [4, ctx.getObject('pepsico_material').directUpdate(material._id, {
|
|
943
943
|
spot_check_pool_year_month: yearMonth,
|
|
944
944
|
spot_checked: true,
|
|
945
|
-
spot_check_type: '
|
|
945
|
+
spot_check_type: '审核专员抽查',
|
|
946
946
|
guding_spot_check_user: approval.special_spot_check || []
|
|
947
947
|
})];
|
|
948
948
|
case 16:
|
|
@@ -922,7 +922,7 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
|
|
|
922
922
|
actionLabel = '请审批';
|
|
923
923
|
}
|
|
924
924
|
if (nextStep === consts_1.Step.awaiting_deployment) {
|
|
925
|
-
actionLabel = "\u5185\u5BB9\u5BA1\u6279\u5DF2\u901A\u8FC7\u5F85\
|
|
925
|
+
actionLabel = "\u5185\u5BB9\u5BA1\u6279\u5DF2\u901A\u8FC7\u5F85\u4F20\u8F93";
|
|
926
926
|
}
|
|
927
927
|
return [4, (0, notification_1.sendNotifications)(ctx, record, nextApproversUserIds_1, actionLabel)];
|
|
928
928
|
case 66:
|
|
@@ -1167,11 +1167,11 @@ var approvalContent = function (ctx, recordId, _a) {
|
|
|
1167
1167
|
}
|
|
1168
1168
|
else if (approvalNew.current_step === consts_1.Step.personnel_review) {
|
|
1169
1169
|
if (!hasReviewed(approvalNew.approval_status)) {
|
|
1170
|
-
console.log('[approvalContent]:
|
|
1170
|
+
console.log('[approvalContent]: 审核专员未审批, 只结束当前用户审批任务,不推进审批进度.');
|
|
1171
1171
|
return [2, {}];
|
|
1172
1172
|
}
|
|
1173
1173
|
currentStepApprovalStatus = approvalNew.approval_status ? consts_1.ApprovalStatus.approved : consts_1.ApprovalStatus.rejected;
|
|
1174
|
-
console.log('[approvalContent]:
|
|
1174
|
+
console.log('[approvalContent]: 审核专员复审完成, 结果为:', currentStepApprovalStatus);
|
|
1175
1175
|
}
|
|
1176
1176
|
if (approvalNew.child_files == 'yes') {
|
|
1177
1177
|
if (!hasReviewed(approvalNew.kids_approval_status)) {
|
|
@@ -1236,10 +1236,10 @@ var rejectContent = function (ctx, recordId, _a) {
|
|
|
1236
1236
|
}
|
|
1237
1237
|
else if (approvalNew.current_step === consts_1.Step.personnel_review) {
|
|
1238
1238
|
if (!hasReviewed(approvalNew.approval_status)) {
|
|
1239
|
-
console.log('[rejectContent]:
|
|
1239
|
+
console.log('[rejectContent]: 审核专员未审批, 只结束当前用户审批任务,不推进审批进度.');
|
|
1240
1240
|
return [2, {}];
|
|
1241
1241
|
}
|
|
1242
|
-
console.log('[rejectContent]:
|
|
1242
|
+
console.log('[rejectContent]: 审核专员复审完成');
|
|
1243
1243
|
}
|
|
1244
1244
|
if (approvalNew.child_files == 'yes') {
|
|
1245
1245
|
if (!hasReviewed(approvalNew.kids_approval_status)) {
|
|
@@ -140,7 +140,7 @@ var sendDelayNotifications = function (ctx, intervalMinutes) { return tslib_1.__
|
|
|
140
140
|
if (!!records_1_1.done) return [3, 6];
|
|
141
141
|
record = records_1_1.value;
|
|
142
142
|
if (!record.material_owner_id) return [3, 5];
|
|
143
|
-
return [4, (0, exports.sendNotifications)(ctx, record, [record.material_owner_id], '
|
|
143
|
+
return [4, (0, exports.sendNotifications)(ctx, record, [record.material_owner_id], '请数据传输')];
|
|
144
144
|
case 4:
|
|
145
145
|
_b.sent();
|
|
146
146
|
_b.label = 5;
|
|
@@ -61,6 +61,12 @@ tab_items:
|
|
|
61
61
|
pepsico_midtier_spot_check:
|
|
62
62
|
group: 素材抽查
|
|
63
63
|
index: 5
|
|
64
|
+
pepsico_material_kanban_fqr:
|
|
65
|
+
group: 数据看板
|
|
66
|
+
index: 6
|
|
67
|
+
pepsico_material_kanban_shr:
|
|
68
|
+
group: 数据看板
|
|
69
|
+
index: 7
|
|
64
70
|
tabs:
|
|
65
71
|
- object_pepsico_material_approval
|
|
66
72
|
- process_delegation_rules
|
|
@@ -293,7 +293,7 @@ cards:
|
|
|
293
293
|
size_x: 7
|
|
294
294
|
size_y: 4
|
|
295
295
|
visualization_settings: >-
|
|
296
|
-
{"graph.dimensions":["material_type"],"graph.metrics":["count"],"card.title":"审核部门素材类型统计","series_settings":{"count":{"title":"四部门"},"Legal审核通过素材类型":{"title":"
|
|
296
|
+
{"graph.dimensions":["material_type"],"graph.metrics":["count"],"card.title":"审核部门素材类型统计","series_settings":{"count":{"title":"四部门"},"Legal审核通过素材类型":{"title":"专员审核"}}}
|
|
297
297
|
- card_id: 67ca584d86c63f0625112c42
|
|
298
298
|
col: 0
|
|
299
299
|
entity_id: 67ca585786c63f0625112c43
|
|
@@ -488,7 +488,7 @@ cards:
|
|
|
488
488
|
size_x: 18
|
|
489
489
|
size_y: 6
|
|
490
490
|
visualization_settings: >-
|
|
491
|
-
{"graph.dimensions":["peoduct"],"graph.metrics":["count"],"stackable.stack_type":null,"card.title":"流程审核通过情况","series_settings":{"count":{"title":"四部门"},"Legal品牌流程审核通过数":{"title":"
|
|
491
|
+
{"graph.dimensions":["peoduct"],"graph.metrics":["count"],"stackable.stack_type":null,"card.title":"流程审核通过情况","series_settings":{"count":{"title":"四部门"},"Legal品牌流程审核通过数":{"title":"专员审核"},"Kids品牌流程审核通过数":{"title":"Kids审核"}},"graph.x_axis.labels_enabled":false,"graph.y_axis.labels_enabled":false,"graph.y_axis.auto_range":true}
|
|
492
492
|
- card_id: 67cab014e4148a062542de66
|
|
493
493
|
col: 6
|
|
494
494
|
entity_id: 67cab027e4148a062542de67
|
|
@@ -14,11 +14,11 @@ options:
|
|
|
14
14
|
value: ai_review
|
|
15
15
|
- label: 部门审核
|
|
16
16
|
value: departmental_review
|
|
17
|
-
- label:
|
|
17
|
+
- label: 专员审核
|
|
18
18
|
value: personnel_review
|
|
19
19
|
- label: 发起人修改
|
|
20
20
|
value: submitter_revisions
|
|
21
|
-
- label:
|
|
21
|
+
- label: 数据传输
|
|
22
22
|
value: awaiting_deployment
|
|
23
23
|
- label: 结束
|
|
24
24
|
value: conclusion
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
name: name
|
|
2
2
|
amis:
|
|
3
3
|
id: 'u:a3c08825b952'
|
|
4
|
-
description:
|
|
4
|
+
description: 满足此条件的审批单流转到审核专员审批步骤,否则流转到四部门并行审核。
|
|
5
5
|
filterable: true
|
|
6
6
|
group: 通用
|
|
7
7
|
index: true
|
|
8
8
|
is_wide: true
|
|
9
|
-
label:
|
|
9
|
+
label: 专员审核规则条件
|
|
10
10
|
required: true
|
|
11
11
|
rows: 3
|
|
12
12
|
searchable: true
|
package/main/default/objects/pepsico_material/buttons/pepsico_material_spot_check.button.yml
CHANGED
|
@@ -153,7 +153,7 @@ amis_schema: |-
|
|
|
153
153
|
]
|
|
154
154
|
}
|
|
155
155
|
},
|
|
156
|
-
"visibleOn": "${ (spot_check_type === '
|
|
156
|
+
"visibleOn": "${ (spot_check_type === '审核专员抽查' && ARRAYINCLUDES(guding_spot_check_user, global.user.userId)) || (spot_check_type === '四部门抽查' && (ARRAYINCLUDES(legal_spot_check_user, global.user.userId) || ARRAYINCLUDES(sra_spot_check_user, global.user.userId) || ARRAYINCLUDES(ca_spot_check_user, global.user.userId) || ARRAYINCLUDES(ns_spot_check_user, global.user.userId))) }"
|
|
157
157
|
}
|
|
158
158
|
],
|
|
159
159
|
"regions": [
|
|
@@ -3,7 +3,7 @@ amis:
|
|
|
3
3
|
id: 'u:e77e52033014'
|
|
4
4
|
multiple: true
|
|
5
5
|
description: >-
|
|
6
|
-
|
|
6
|
+
素材驳回后通过“上传补充素材”按钮来上传的补充(版权)文件,以及素材传输前关联其他补充文件的字段;</br> 请勿将将审核的素材上传到该字段!</br>
|
|
7
7
|
审核驳回后,Word、PPT素材请在线修改、图片、视频素材请直接替换素材。
|
|
8
8
|
group: 通用
|
|
9
9
|
is_wide: true
|
package/main/default/objects/pepsico_material_approval/buttons/pepsico_confirm_online.button.yml
CHANGED
|
@@ -5,7 +5,7 @@ amis_schema: |-
|
|
|
5
5
|
"body": [
|
|
6
6
|
{
|
|
7
7
|
"type": "button",
|
|
8
|
-
"label": "
|
|
8
|
+
"label": "立即传输",
|
|
9
9
|
"id": "u:pepsico_confirm_online",
|
|
10
10
|
"editorState": "default",
|
|
11
11
|
"visibleOn": "${material_owner_id == context.user.user && current_step == 'awaiting_deployment' && formFactor != 'SMALL'}",
|
|
@@ -19,7 +19,7 @@ amis_schema: |-
|
|
|
19
19
|
"ignoreError": false,
|
|
20
20
|
"dialog": {
|
|
21
21
|
"type": "dialog",
|
|
22
|
-
"title": "
|
|
22
|
+
"title": "传输信息确认",
|
|
23
23
|
"body": [
|
|
24
24
|
{
|
|
25
25
|
"id": "u:704d9e8700c3",
|
|
@@ -231,7 +231,7 @@ amis_schema: |-
|
|
|
231
231
|
"definitions": {}
|
|
232
232
|
}
|
|
233
233
|
is_enable: true
|
|
234
|
-
label:
|
|
234
|
+
label: 立即传输
|
|
235
235
|
locked: false
|
|
236
236
|
'on': record_only
|
|
237
237
|
type: amis_button
|
package/main/default/objects/pepsico_material_approval/buttons/pepsico_postpone_online.button.yml
CHANGED
|
@@ -5,7 +5,7 @@ amis_schema: |-
|
|
|
5
5
|
"body": [
|
|
6
6
|
{
|
|
7
7
|
"type": "button",
|
|
8
|
-
"label": "
|
|
8
|
+
"label": "延后传输",
|
|
9
9
|
"id": "u:pepsico_postpone_online",
|
|
10
10
|
"editorState": "default",
|
|
11
11
|
"visibleOn": "${material_owner_id == context.user.user && current_step == 'awaiting_deployment' && formFactor != 'SMALL'}",
|
|
@@ -18,11 +18,11 @@ amis_schema: |-
|
|
|
18
18
|
"actionType": "dialog",
|
|
19
19
|
"dialog": {
|
|
20
20
|
"type": "dialog",
|
|
21
|
-
"title": "
|
|
21
|
+
"title": "延后传输",
|
|
22
22
|
"body": [
|
|
23
23
|
{
|
|
24
24
|
"type": "input-datetime",
|
|
25
|
-
"label": "
|
|
25
|
+
"label": "延后传输提醒日期",
|
|
26
26
|
"name": "postpone_launch_date",
|
|
27
27
|
"id": "u:7f8f9ee8f513",
|
|
28
28
|
"placeholder": "请选择日期以及时间",
|
|
@@ -124,7 +124,7 @@ amis_schema: |-
|
|
|
124
124
|
"definitions": {}
|
|
125
125
|
}
|
|
126
126
|
is_enable: true
|
|
127
|
-
label:
|
|
127
|
+
label: 延后传输
|
|
128
128
|
locked: false
|
|
129
129
|
'on': record_only
|
|
130
130
|
type: amis_button
|
|
@@ -20,13 +20,13 @@ options:
|
|
|
20
20
|
- label: 部门审核
|
|
21
21
|
value: departmental_review
|
|
22
22
|
color: '#02355a'
|
|
23
|
-
- label:
|
|
23
|
+
- label: 专员审核
|
|
24
24
|
value: personnel_review
|
|
25
25
|
color: '#02355a'
|
|
26
26
|
- label: 发起人修改
|
|
27
27
|
value: submitter_revisions
|
|
28
28
|
color: '#02355a'
|
|
29
|
-
- label:
|
|
29
|
+
- label: 等待传输
|
|
30
30
|
value: awaiting_deployment
|
|
31
31
|
color: '#02355a'
|
|
32
32
|
- label: 结束
|
|
@@ -3,16 +3,16 @@ amis:
|
|
|
3
3
|
id: 'u:1b7a7abe4268'
|
|
4
4
|
description: ''
|
|
5
5
|
enable_thousands: true
|
|
6
|
-
group:
|
|
6
|
+
group: 数据传输信息
|
|
7
7
|
inlineHelpText: ''
|
|
8
8
|
is_wide: true
|
|
9
|
-
label:
|
|
9
|
+
label: 传输情况
|
|
10
10
|
options:
|
|
11
|
-
- label:
|
|
11
|
+
- label: 等待传输
|
|
12
12
|
value: pending
|
|
13
|
-
- label:
|
|
13
|
+
- label: 延后传输
|
|
14
14
|
value: postpone
|
|
15
|
-
- label:
|
|
15
|
+
- label: 已传输
|
|
16
16
|
value: launched
|
|
17
17
|
readonly: true
|
|
18
18
|
sort_no: 2500
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
name: all
|
|
2
2
|
columns:
|
|
3
3
|
- field: name
|
|
4
|
-
width: '350'
|
|
5
4
|
wrap: true
|
|
6
5
|
- field: remark
|
|
7
|
-
width: '350'
|
|
8
6
|
wrap: true
|
|
9
7
|
- field: legal_assistance
|
|
10
8
|
- field: legal_reviewer
|
|
@@ -15,7 +13,6 @@ columns:
|
|
|
15
13
|
- field: ca_assistance
|
|
16
14
|
- field: ca_reviewer
|
|
17
15
|
- field: assistance
|
|
18
|
-
width: '250'
|
|
19
16
|
- field: reviewer
|
|
20
17
|
- field: kids_assistance
|
|
21
18
|
- field: kids_reviewer
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
name: role
|
|
2
|
+
amis:
|
|
3
|
+
id: 'u:dd23bd6235b3'
|
|
4
|
+
data_type: text
|
|
5
|
+
filterable: true
|
|
6
|
+
group: 系统信息
|
|
7
|
+
index: true
|
|
8
|
+
label: Role
|
|
9
|
+
options:
|
|
10
|
+
- label: 素材审核人
|
|
11
|
+
value: 'shr'
|
|
12
|
+
- label: 素材协作人
|
|
13
|
+
value: 'xzr'
|
|
14
|
+
- label: 素材发起人
|
|
15
|
+
value: 'fqr'
|
|
16
|
+
- label: 系统支持
|
|
17
|
+
value: 'xtzc'
|
|
18
|
+
required: true
|
|
19
|
+
searchable: true
|
|
20
|
+
sort_no: 356
|
|
21
|
+
multiple: false
|
|
22
|
+
type: select
|
|
23
|
+
visible_on: '{{global.user.is_space_admin}}'
|