Procházet zdrojové kódy

修复模板无默认过滤条件时体系运行记录盒模板归档参数过滤无效问题

shenqilong před 1 rokem
rodič
revize
5bc86afb27

+ 16 - 16
src/views/platform/data/dataTemplate/template-list.vue

@@ -188,27 +188,27 @@ export default {
             const customBtn = buttons.filter(i => i.show_on_record === 'Y')
             return [...defaultBtn, ...customBtn]
         },
-        dealFilter (dataList) {
+        dealFilter (dataList = []) {
             // 1.去除原过滤条件中的编制部门在其中
             // 2.追加数据模板归档中的过滤条件
             // 3.增加地点过滤(若为第一层级用户,则过滤出所有一二级地点数据;若为第二级用户,则过滤当前地点数据)
             const levelFilter = this.getLevelFilter()
-            if (!dataList.length) {
-                // 无过滤条件时默认地点过滤
-                return [
-                    {
-                        label: '默认条件',
-                        key: this.$utils.guid(),
-                        type: 'condition',
-                        rights: [{ type: 'all' }],
-                        filter: {
-                            condition: 'AND',
-                            rules: [levelFilter]
-                        }
+
+            // 无过滤条件时默认地点过滤
+            const initList = dataList.length ? dataList : [
+                {
+                    label: '默认条件',
+                    key: this.$utils.guid(),
+                    type: 'condition',
+                    rights: [{ type: 'all' }],
+                    filter: {
+                        condition: 'AND',
+                        rules: [levelFilter]
                     }
-                ]
-            }
-            const newDataList = dataList.map(data => {
+                }
+            ]
+
+            const newDataList = initList.map(data => {
                 const rules = data.filter.rules.filter(i => i.id !== 'find_in_set' && !i.value.includes('cscript.findPositionId'))
                 const newRules = [
                     ...this.filterParams.map(item => ({