@steedos-labs/content-compliance-bev 0.0.3 → 0.0.5

package/main/default/pages/pepsico_content_review_detail.page.amis.json

@@ -54,7 +54,7 @@
                     "className": "contents",
                     "items": {
                         "type": "service",
-                        "id": "u:service1",
+                        "id": "u:pepsico_approval_task",
                         "api": {
                             "url": "/api/v6/data/pepsico_approval_task?skip=0&top=1000&fields=_id",
                             "requestAdaptor": "api.url = api.url + `&filters=${JSON.stringify([['pepsico_material_approval', '=', context.recordId],['approval_field', '=', 'approval_status'],['owner', '=', context.handler_guding[context.index]]])}`; return api;",
@@ -62,7 +62,10 @@
                         },
                         "body": {
                             "type": "service",
-                            "id": "u:service2",
+                            "id": "u:pepsico_approval_task_material",
+                            "data": {
+                                "approval_status": "${approval_status}"
+                            },
                             "api": {
                                 "url": "/api/v6/data/pepsico_material?skip=0&top=1000&fields=_id,name,space",
                                 "requestAdaptor": "api.url = api.url + `&filters=${JSON.stringify([['pepsico_material_approval', '=', context.recordId],['void_material', '!=', true]])}`; return api;",
@@ -97,7 +100,7 @@
                                                             "id": "u:9c1860a9b300",
                                                             "crudMode": "table",
                                                             "crudDataFilter": "crud.bulkActions = null;",
-                                                            "adaptor": "debugger;window.completeMaterialDataSimple(payload, context.materialList)",
+                                                            "adaptor": "window.completeMaterialDataSimple(payload, context.materialList)",
                                                             "requestAdaptor": "api.data.query = api.data.query.replace('filters: []', 'filters: ' + JSON.stringify([['pepsico_material_approval', '=', context.pepsico_material_approval],['approval_field', '=', 'approval_status'],['owner', '=', context.owner]])).replace('filters:[]', 'filters:'+JSON.stringify([['pepsico_material_approval', '=', context.pepsico_material_approval],['approval_field', '=', 'approval_status'],['owner', '=', context.owner]]))"
                                                         }
                                                     ],
@@ -128,7 +131,16 @@
                             }
                         }
                     },
-                    "visibleOn": "${approval_type === 'personnel_review' && review_status != 'draft'}"
+                    "visibleOn": "${false && approval_type === 'personnel_review' && review_status != 'draft'}"
+                },
+                {
+                    "type": "tpl",
+                    "tpl": "<li class=\"col-span-1 flex rounded-md shadow-sm\">\n  <div class=\"flex w-16 shrink-0 items-center justify-center rounded-l-md bg-private text-base font-medium text-white\">固定</div>\n  <div class=\"flex flex-1 items-center justify-between truncate rounded-r-md border-b border-r border-t border-gray-200 bg-white\">\n    <div class=\"flex-1 truncate px-4 py-2 text-sm\">\n      <a href=\"#\" class=\"font-medium text-gray-900 hover:text-gray-600\">${(_display.handler_guding || _display.reviewer)|pick:label}</a>\n      <p class=\"text-gray-500 m-0 h-5\"><span class='mr-4'>${CONCATENATE(IF(approval_materials_quantity, approval_materials_quantity, 0), ' / ', materials_quantity)}</span>${IFS(approval_status === true, '<i class=\"fa-solid fa-check\"></i>', approval_status === false, '<i class=\"fa-solid fa-xmark\"></i>', !approval_status, '')}</p>\n    </div>\n  </div>\n</li>",
+                    "inline": true,
+                    "wrapperComponent": "",
+                    "id": "u:ec5fe1e3ac08",
+                    "visibleOn": "${approval_type === 'personnel_review' && review_status != 'draft'}",
+                    "editorState": "default"
                 },
                 {
                     "type": "tpl",

package/main/default/pages/pepsico_material_detail.page.amis.json

@@ -518,6 +518,24 @@
                             "headerClassName": "pb-2 bg-transparent border-none",
                             "bodyClassName": "px-0 pb-0",
                             "body": [
+                                {
+                                    "type": "alert",
+                                    "editorState": "default",
+                                    "body": [
+                                        {
+                                            "type": "tpl",
+                                            "tpl": "提示：素材未通过商标检索",
+                                            "wrapperComponent": "",
+                                            "inline": false,
+                                            "id": "u:c1ef42dcf0a4",
+                                            "editorState": "default"
+                                        }
+                                    ],
+                                    "level": "danger",
+                                    "className": "mb-1",
+                                    "id": "u:356998cc6f17",
+                                    "visibleOn": "${classification == '22335110412927067-22335110412927093' && is_trademark_checked == 'no'}"
+                                },
                                 {
                                     "type": "rooms-provider",
                                     "baseUrl": "${context.rootUrl}",

package/main/default/pages/pepsico_material_detail.page.yml

@@ -1,4 +1,7 @@
 name: pepsico_material_detail
+__filename: >-
+  /workspaces/steedos-project-pepsico/steedos-packages/content-review/main/default/pages/pepsico_material_detail.page.yml
+__timestamp: 1764119559435
 is_active: true
 label: 材料素材记录页
 locked: false

package/main/default/pages/pepsico_midtier_spot_check.page.amis.json

@@ -1,7 +1,49 @@
 {
     "type": "page",
     "title": "Welcome to Steedos",
+    "id": "page:spot_check",
+    "bodyClassName": "h-full p-0 sm:bg-gray-50",
+    "css": {
+        ".listHeight": {
+            "height": "calc(100% - 80px)"
+        }
+    },
     "body": [
+        {
+            "type": "container",
+            "body": [
+                {
+                    "type": "tpl",
+                    "tpl": "<li class=\"col-span-1 flex rounded-md shadow-sm\">\n  <div class=\"flex w-16 shrink-0 items-center justify-center rounded-l-md bg-private text-base font-medium text-white\">总数</div>\n  <div class=\"flex flex-1 items-center justify-between truncate rounded-r-md border-b border-r border-t border-gray-200 bg-white\">\n    <div class=\"flex-1 truncate px-4 py-2 text-sm\">\n      <p class=\"text-gray-500 m-0 h-5\"><span class='mr-4'>${count}</span></p>\n    </div>\n  </div>\n</li>",
+                    "inline": true,
+                    "wrapperComponent": "",
+                    "id": "u:65eac8efca60",
+                    "editorState": "default"
+                },{
+                    "type": "tpl",
+                    "tpl": "<li class=\"col-span-1 flex rounded-md shadow-sm\">\n  <div class=\"flex w-16 shrink-0 items-center justify-center rounded-l-md bg-private text-base font-medium text-white\">已抽查数</div>\n  <div class=\"flex flex-1 items-center justify-between truncate rounded-r-md border-b border-r border-t border-gray-200 bg-white\">\n    <div class=\"flex-1 truncate px-4 py-2 text-sm\">\n      <p class=\"text-gray-500 m-0 h-5\"><span class='mr-4'>${IF(spot_count, spot_count, 0)}</span></p>\n    </div>\n  </div>\n</li>",
+                    "inline": true,
+                    "wrapperComponent": "",
+                    "id": "u:1b743b2be88d",
+                    "editorState": "default"
+                },
+                {
+                    "type": "tpl",
+                    "tpl": "<li class=\"col-span-1 flex rounded-md shadow-sm\">\n  <div class=\"flex w-16 shrink-0 items-center justify-center rounded-l-md bg-private text-base font-medium text-white\">抽查率</div>\n  <div class=\"flex flex-1 items-center justify-between truncate rounded-r-md border-b border-r border-t border-gray-200 bg-white\">\n    <div class=\"flex-1 truncate px-4 py-2 text-sm\">\n      <p class=\"text-gray-500 m-0 h-5\"><span class='mr-4'>${IF(count > 0, CONCATENATE(ROUND(IF(spot_count, spot_count, 0)/count * 100), '%'), '')}</span></p>\n    </div>\n  </div>\n</li>",
+                    "inline": true,
+                    "wrapperComponent": "",
+                    "id": "u:1b743b2be88d",
+                    "editorState": "default"
+                }
+            ],
+            "size": "none",
+            "wrapperBody": false,
+            "id": "u:364038776887",
+            "isFixedHeight": false,
+            "isFixedWidth": false,
+            "visibleOn": "${1==1}",
+            "className": "grid grid-cols-1 gap-5 sm:grid-cols-2 sm:gap-6 lg:grid-cols-5 sm:m-4 sm:sticky z-20"
+        },
         {
             "type": "steedos-object-listview",
             "className": "listHeight",
@@ -12,11 +54,10 @@
             "id": "u:ee75c526fe3d",
             "crudMode": "table",
             "ctx": {
-                "auto_open_filter": true,
-                "formFactor": "LARGE"
+                "auto_open_filter": true
             },
-            "requestAdaptor": "const _sfilters = JSON.parse(JSON.stringify(filters)); if(_sfilters.length > 0){_sfilters.push('and')};_sfilters.push(['spot_checked', '=', true]); api.data.query = api.data.query.slice(0, -1) + ',spot_count:pepsico_material__count(filters: '+JSON.stringify(_sfilters)+')}'; ",
-            "adaptor": "var scope2 = context._scoped; scope2.doAction({actionType: \"setValue\", componentId: \"page:midtier_spot_check\", args: {value: {count: payload.data.count, spot_count: payload.data.spot_count}}})"
+            "requestAdaptor": "const _sfilters = JSON.parse(JSON.stringify(filters)); if(_sfilters.length > 0){_sfilters.push('and')};_sfilters.push(['spot_checked_done', '=', true]); api.data.query = api.data.query.slice(0, -1) + ',spot_count:pepsico_material__count(filters: '+JSON.stringify(_sfilters)+')}'; ", 
+            "adaptor": "var scope2 = context._scoped; scope2.doAction({actionType: \"setValue\", componentId: \"page:spot_check\", args: {value: {count: payload.data.count, spot_count: payload.data.spot_count}}})"
         }
     ],
     "regions": [
@@ -24,21 +65,8 @@
     ],
     "data": {
         "initialValues": {},
-        "appId": "builder",
         "title": "",
         "listName": "kol_midtier",
         "showFieldsFilter": true
-    },
-    "id": "page:midtier_spot_check",
-    "bodyClassName": "h-full p-0 sm:bg-gray-50",
-    "css": {
-        ".listHeight": {
-            "height": "calc(100% - 80px)"
-        }
-    },
-    "asideResizor": false,
-    "editorState": "default",
-    "pullRefresh": {
-        "disabled": true
     }
 }

package/main/default/pages/pepsico_spot_check.page.amis.json

@@ -56,7 +56,7 @@
             "ctx": {
                 "auto_open_filter": true
             },
-            "requestAdaptor": "const _sfilters = JSON.parse(JSON.stringify(filters)); if(_sfilters.length > 0){_sfilters.push('and')};_sfilters.push(['spot_checked', '=', true]); api.data.query = api.data.query.slice(0, -1) + ',spot_count:pepsico_material__count(filters: '+JSON.stringify(_sfilters)+')}'; ", 
+            "requestAdaptor": "const _sfilters = JSON.parse(JSON.stringify(filters)); if(_sfilters.length > 0){_sfilters.push('and')};_sfilters.push(['spot_checked_done', '=', true]); api.data.query = api.data.query.slice(0, -1) + ',spot_count:pepsico_material__count(filters: '+JSON.stringify(_sfilters)+')}'; ", 
             "adaptor": "var scope2 = context._scoped; scope2.doAction({actionType: \"setValue\", componentId: \"page:spot_check\", args: {value: {count: payload.data.count, spot_count: payload.data.spot_count}}})"
         }
     ],
@@ -65,7 +65,6 @@
     ],
     "data": {
         "initialValues": {},
-        "appId": "builder",
         "title": "",
         "listName": "spot_check",
         "showFieldsFilter": true

package/main/default/pages/pepsico_spot_check_dco.page.amis.json

@@ -48,7 +48,7 @@
                 "auto_open_filter": true,
                 "formFactor": "LARGE"
             },
-            "requestAdaptor": "const _sfilters = JSON.parse(JSON.stringify(filters)); if(_sfilters.length > 0){_sfilters.push('and')};_sfilters.push(['spot_checked', '=', true]); api.data.query = api.data.query.slice(0, -1) + ',spot_count:pepsico_material__count(filters: '+JSON.stringify(_sfilters)+')}'; ",
+            "requestAdaptor": "const _sfilters = JSON.parse(JSON.stringify(filters)); if(_sfilters.length > 0){_sfilters.push('and')};_sfilters.push(['spot_checked_done', '=', true]); api.data.query = api.data.query.slice(0, -1) + ',spot_count:pepsico_material__count(filters: '+JSON.stringify(_sfilters)+')}'; ",
             "adaptor": "var scope2 = context._scoped; scope2.doAction({actionType: \"setValue\", componentId: \"page:dco_spot_check\", args: {value: {count: payload.data.count, spot_count: payload.data.spot_count}}})"
         }
     ],
@@ -57,7 +57,6 @@
     ],
     "data": {
         "initialValues": {},
-        "appId": "builder",
         "title": "",
         "listName": "dco_spot_check",
         "showFieldsFilter": true

package/main/default/permissionsets/pepsico_spot_check_users.permissionset.yml

@@ -0,0 +1,9 @@
+name: pepsico_spot_check_users
+enable_MFA: false
+label: 抽查人
+locked: false
+login_expiration_in_days: 90
+logout_other_clients: false
+phone_login_expiration_in_days: 90
+phone_logout_other_clients: false
+type: permission_set

package/main/default/tabs/pepsico_midtier_spot_check.tab.yml

@@ -16,5 +16,5 @@ permissions:
     permission_set: user
   - locked: false
     permission: 'on'
-    permission_set: pepsico_spot_check_view
+    permission_set: pepsico_spot_check_users
 type: page

package/main/default/tabs/pepsico_spot_check.tab.yml

@@ -10,14 +10,11 @@ page: pepsico_spot_check
 permissions:
   - locked: false
     permission: 'on'
-    permission_set: pepsico_spot_check
+    permission_set: pepsico_spot_check_users
   - locked: false
     permission: 'on'
     permission_set: admin
   - locked: false
     permission: 'off'
     permission_set: user
-  - locked: false
-    permission: 'on'
-    permission_set: pepsico_spot_check_view
 type: page

package/main/default/triggers/pepsico_material_approval_changName.trigger.yml

@@ -24,7 +24,15 @@ handler: |-
     if (hasChanges) {
         const updateData = {};
         syncFields.forEach(field => {
-            updateData[field] = record[field];
+            if(field === 'product'){
+                try{
+                    updateData[field] = _.first(_.split(record.product, '-'));
+                }catch(e){
+                    console.log(e)
+                }
+            }else{
+                updateData[field] = record[field];
+            }
         });
 
         const mRecords = await objects.pepsico_material.find({ 

package/main/default/triggers/pepsico_material_approval_change.trigger.yml

@@ -10,13 +10,13 @@ handler: |-
   if(ctx.params.isInsert){
     if(doc.approval_type === 'personnel_review'){
       if(_.isEmpty(doc.reviewer)){
-        throw new Error('固定审核人缺失, 请确认审批单对应审核人员信息');
+        throw new Error('固定审核人缺失, 请确认审批单填写信息或联系管理员进行处理');
       }
     }
 
     if(doc.approval_type === 'departmental_review'){
       if(_.isEmpty(doc.ca_reviewer) && _.isEmpty(doc.legal_reviewer) && _.isEmpty(doc.ns_reviewer) && _.isEmpty(doc.sra_reviewer)){
-        throw new Error('审核人缺失, 请确认审批单对应审核人员信息');
+        throw new Error('审核人缺失, 请确认审批单填写信息或联系管理员进行处理');
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos-labs/content-compliance-bev",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "description": "百事Bev内容审核系统",
     "main": "package.service.js",
     "scripts": {