@steedos-labs/content-compliance-bev 0.0.8 → 0.0.10

package/main/default/objects/pepsico_material_approval/fields/is_skip_approver.field.yml

@@ -2,7 +2,7 @@ name: is_skip_approver
 amis:
   id: 'u:7fcecdfd02fb'
 group: 审核情况
-is_wide: true
+is_wide: false
 label: 跳过审核
 readonly: true
 sort_no: 3250

package/main/default/objects/pepsico_material_approval/listviews/deletion.listview.yml

@@ -0,0 +1,32 @@
+name: deletion
+columns:
+  - field: name
+    width: '400'
+    wrap: true
+  - field: current_step
+  - field: material_owner
+    width: '250'
+    wrap: true
+  - field: owner_department
+    wrap: false
+  - field: approved_time
+    width: '150'
+crud_mode: table
+filter_scope: space
+filters: []
+is_enable: true
+label: 所有
+mobile_columns:
+  - field: name
+  - field: owner
+  - field: owner_department
+  - field: current_step
+  - field: review_status
+scrolling_mode: standard
+shared: true
+shared_to: space
+sort:
+  - field_name: approved_time
+    order: asc
+sort_no: 60
+type: grid

package/main/default/objects/pepsico_material_spot_check/listviews/all.listview.yml

@@ -6,7 +6,7 @@ columns:
   - field: pepsico_spot_check_status
   - field: pepsico_spot_check
   - field: role
-  - field: spot_check_time
+  - field: spot_checked_done_time
   - field: pepsico_material
     width: '400'
     wrap: true

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

@@ -18,7 +18,7 @@
                     "inline": true,
                     "wrapperComponent": "",
                     "id": "u:65eac8efca60",
-                    "visibleOn": "${approval_type === 'departmental_review' && review_status != 'draft' && COUNT(handler_ns) > 0}",
+                    "visibleOn": "${approval_type === 'departmental_review' && review_status != 'draft' && COUNT(handler_ns) > 0 && current_step != 'ai_review'}",
                     "editorState": "default"
                 },
                 {
@@ -36,7 +36,7 @@
                     "inline": true,
                     "wrapperComponent": "",
                     "id": "u:912d54a43263",
-                    "visibleOn": "${approval_type === 'departmental_review' && review_status != 'draft' && COUNT(handler_sra) > 0}",
+                    "visibleOn": "${approval_type === 'departmental_review' && review_status != 'draft' && COUNT(handler_sra) > 0 && current_step != 'ai_review'}",
                     "editorState": "default"
                 },
                 {
@@ -45,7 +45,7 @@
                     "inline": true,
                     "wrapperComponent": "",
                     "id": "u:3dd4613d67ae",
-                    "visibleOn": "${approval_type === 'departmental_review' && review_status != 'draft' && COUNT(handler_ca) > 0}",
+                    "visibleOn": "${approval_type === 'departmental_review' && review_status != 'draft' && COUNT(handler_ca) > 0 && current_step != 'ai_review'}",
                     "editorState": "default"
                 },
                 {
@@ -131,7 +131,7 @@
                             }
                         }
                     },
-                    "visibleOn": "${false && approval_type === 'personnel_review' && review_status != 'draft'}"
+                    "visibleOn": "${false && approval_type === 'personnel_review' && review_status != 'draft' && current_step != 'ai_review'}"
                 },
                 {
                     "type": "tpl",
@@ -139,7 +139,7 @@
                     "inline": true,
                     "wrapperComponent": "",
                     "id": "u:ec5fe1e3ac08",
-                    "visibleOn": "${approval_type === 'personnel_review' && review_status != 'draft'}",
+                    "visibleOn": "${approval_type === 'personnel_review' && review_status != 'draft' && COUNT(handler_guding) > 0 && current_step != 'ai_review'}",
                     "editorState": "default"
                 },
                 {
@@ -148,7 +148,7 @@
                     "inline": true,
                     "wrapperComponent": "",
                     "id": "u:41fda075cc8b",
-                    "visibleOn": "${child_files === 'yes' && review_status != 'draft'}",
+                    "visibleOn": "${child_files === 'yes' && review_status != 'draft' && COUNT(handler_kids) > 0 && current_step != 'ai_review'}",
                     "editorState": "default"
                 }
             ],

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

@@ -63,7 +63,7 @@
                                         },
                                         {
                                             "type": "iframe",
-                                            "src": "${context.rootUrl}/api/page/public/pdf_view?fileUrl=/api/files/files/${_display.material.value}",
+                                            "src": "${context.rootUrl}/api/page/public/pdf_view?fileUrl=/api/v6/files/cfs.files.filerecord/${_display.material.value}/${_display.material.name}",
                                             "id": "pdf-viewer",
                                             "visibleOn": "${extension_type === 'pdf'}",
                                             "height": "100%"
@@ -312,7 +312,7 @@
                                         },
                                         {
                                             "type": "iframe",
-                                            "src": "${context.rootUrl}/api/page/public/pdf_view?fileUrl=/api/files/files/${_display.material.value}",
+                                            "src": "${context.rootUrl}/api/page/public/pdf_view?fileUrl=/api/v6/files/cfs.files.filerecord/${_display.material.value}/${_display.material.name}",
                                             "id": "pdf-viewer",
                                             "visibleOn": "${extension_type === 'pdf'}",
                                             "height": "100%"

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

@@ -48,7 +48,7 @@
                         },
                         {
                             "type": "iframe",
-                            "src": "${context.rootUrl}/api/page/public/pdf_view?fileUrl=/api/files/files/${_display.material.value}",
+                            "src": "${context.rootUrl}/api/page/public/pdf_view?fileUrl=/api/v6/files/cfs.files.filerecord/${_display.material.value}/${_display.material.name}",
                             "id": "pdf-viewer",
                             "visibleOn": "${extension_type === 'pdf'}",
                             "height": "100%"

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

@@ -24,7 +24,7 @@
             "className": "listHeight",
             "label": "列表视图",
             "objectApiName": "pepsico_material_approval",
-            "listName": "all",
+            "listName": "deletion",
             "showHeader": false,
             "id": "u:ee75c526fe3d772",
             "crudMode": "table",
@@ -41,7 +41,7 @@
     "data": {
         "initialValues": {},
         "appId": "pepsico_content_review",
-        "listName": "all",
+        "listName": "deletion",
         "showFieldsFilter": false,
         "showPermanentDeleteBtn": true
     }

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

@@ -32,7 +32,7 @@
                                 "url": "/api/record/export/pepsico_material",
                                 "method": "get",
                                 "messages": {},
-                                "requestAdaptor": "const exportFileName = `${context.logInfo._display.product}:${_.replace(context.reportInfo.year_month, '-', '年')}月素材抽查情况`; const yearMonthArray = context.reportInfo.year_month.split('-'); const date = moment([Number(yearMonthArray[0]), Number(yearMonthArray[1]) - 1]); const monthStart=date.startOf('month').toDate(); const monthEnd=date.endOf('month').toDate();const _sfilters = []; if(_sfilters.length > 0){_sfilters.push('and')};_sfilters.push(['spot_checked', '=', true]); _sfilters.push('and'); _sfilters.push(['product','=', context.logInfo.product]); _sfilters.push('and'); _sfilters.push(['classification','=', context.logInfo.classification]); _sfilters.push('and'); _sfilters.push(['spot_check_time','between', [monthStart, monthEnd]]); api.url = api.url + '?$select=' + encodeURIComponent(context.exportFields) + '&filename=' + encodeURIComponent(exportFileName); api.url = api.url +'&filters=' + encodeURIComponent(JSON.stringify(_sfilters));  return api;"
+                                "requestAdaptor": "const exportFileName = `${context.logInfo._display.product}:${_.replace(context.reportInfo.year_month, '-', '年')}月素材抽查情况`; const yearMonthArray = context.reportInfo.year_month.split('-'); const date = moment([Number(yearMonthArray[0]), Number(yearMonthArray[1]) - 1]); const monthStart=date.startOf('month').toDate(); const monthEnd=date.endOf('month').toDate();const _sfilters = []; if(_sfilters.length > 0){_sfilters.push('and')};_sfilters.push(['spot_checked', '=', true]); _sfilters.push('and'); _sfilters.push(['product','=', context.logInfo.product]); _sfilters.push('and'); _sfilters.push(['classification','=', context.logInfo.classification]); _sfilters.push('and'); _sfilters.push(['spot_checked_done_time','between', [monthStart, monthEnd]]); api.url = api.url + '?$select=' + encodeURIComponent(context.exportFields) + '&filename=' + encodeURIComponent(exportFileName); api.url = api.url +'&filters=' + encodeURIComponent(JSON.stringify(_sfilters));  return api;"
                             }
                         },
                         "actionType": "download"
@@ -55,7 +55,7 @@
             "ctx": {
                 "auto_open_filter": false
             },
-            "requestAdaptor": "const yearMonthArray = context.reportInfo.year_month.split('-'); const date = moment([Number(yearMonthArray[0]), Number(yearMonthArray[1]) - 1]); const monthStart=date.startOf('month').toDate(); const monthEnd=date.endOf('month').toDate();const _sfilters = JSON.parse(JSON.stringify(filters)); if(_sfilters.length > 0){_sfilters.push('and')};_sfilters.push(['spot_checked', '=', true]); _sfilters.push('and'); _sfilters.push(['product','=', context.logInfo.product]); _sfilters.push('and'); _sfilters.push(['classification','=', context.logInfo.classification]); _sfilters.push('and'); _sfilters.push(['spot_check_time','between', [monthStart, monthEnd]]); api.data.query = api.data.query.replace('pepsico_material(filters: []', 'pepsico_material(filters:' + JSON.stringify(_sfilters)).replace('pepsico_material__count(filters:[]', 'pepsico_material__count(filters:' + JSON.stringify(_sfilters)); "
+            "requestAdaptor": "const yearMonthArray = context.reportInfo.year_month.split('-'); const date = moment([Number(yearMonthArray[0]), Number(yearMonthArray[1]) - 1]); const monthStart=date.startOf('month').toDate(); const monthEnd=date.endOf('month').toDate();const _sfilters = JSON.parse(JSON.stringify(filters)); if(_sfilters.length > 0){_sfilters.push('and')};_sfilters.push(['spot_checked', '=', true]); _sfilters.push('and'); _sfilters.push(['product','=', context.logInfo.product]); _sfilters.push('and'); _sfilters.push(['classification','=', context.logInfo.classification]); _sfilters.push('and'); _sfilters.push(['spot_checked_done_time','between', [monthStart, monthEnd]]); api.data.query = api.data.query.replace('pepsico_material(filters: []', 'pepsico_material(filters:' + JSON.stringify(_sfilters)).replace('pepsico_material__count(filters:[]', 'pepsico_material__count(filters:' + JSON.stringify(_sfilters)); "
         }
     ],
     "regions": [

package/package.json

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