lab_xuhui 发布系统代码 [ibz-dst，应用]

app_web/src/locale/lanres/entities/dareport/dareport_BO_CN_base.ts

@@ -124,6 +124,14 @@ function getLocaleResourceBase(){
 			},
 		},
 		editviewtoolbar_toolbar: {
+			tbitem1_ckbb: {
+				caption: commonLogic.appcommonhandle("查看报表",null),
+				tip: commonLogic.appcommonhandle("查看报表",null),
+			},
+			tbitem2: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),

app_web/src/locale/lanres/entities/dareport/dareport_en_US_base.ts

@@ -124,6 +124,14 @@ function getLocaleResourceBase(){
 			},
 		},
 		editviewtoolbar_toolbar: {
+			tbitem1_ckbb: {
+				caption: commonLogic.appcommonhandle("查看报表",null),
+				tip: commonLogic.appcommonhandle("查看报表",null),
+			},
+			tbitem2: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),

app_web/src/locale/lanres/entities/dareport/dareport_zh_CN_base.ts

@@ -124,6 +124,14 @@ function getLocaleResourceBase(){
 			},
 		},
 		editviewtoolbar_toolbar: {
+			tbitem1_ckbb: {
+				caption: commonLogic.appcommonhandle("查看报表",null),
+				tip: commonLogic.appcommonhandle("查看报表",null),
+			},
+			tbitem2: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),

app_web/src/pages/analysis/dareport-bbzscustom-view/dareport-bbzscustom-view.less

+.dareport-bbzscustom-view{
+    position: relative;
+}
+
+

app_web/src/pages/analysis/dareport-bbzscustom-view/dareport-bbzscustom-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import DAReportBBZSCustomViewBase from './dareport-bbzscustom-view-base.vue';
+
+@Component({
+    components: {
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class DAReportBBZSCustomView extends DAReportBBZSCustomViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/analysis/dareport-edit-view/dareport-edit-view-base.vue

@@ -6,6 +6,14 @@
 <div slot='title' class="header-container">
     <span class='caption-info'>{{$t(model.srfCaption)}}</span>
     <div class='toolbar-container'>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.tbitem1_ckbb.visabled" :disabled="toolBarModels.tbitem1_ckbb.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_ckbb' }, $event)">
+                    <i class=''></i>
+                    <span class='caption'>{{$t('entities.dareport.editviewtoolbar_toolbar.tbitem1_ckbb.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.dareport.editviewtoolbar_toolbar.tbitem1_ckbb.tip')}}</div>
+        </tooltip>
+        <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem3.visabled" :disabled="toolBarModels.tbitem3.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem3' }, $event)">
                     <i class='fa fa-save'></i>
@@ -378,6 +386,9 @@ export default class DAReportEditViewBase extends Vue {
      * @memberof DAReportEditView
      */
     public toolBarModels: any = {
+        tbitem1_ckbb: { name: 'tbitem1_ckbb', actiontarget: 'NONE', caption: '查看报表', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'CKBB', target: 'SINGLEKEY' } },
+
+        tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -738,6 +749,9 @@ export default class DAReportEditViewBase extends Vue {
      * @memberof DAReportEditViewBase
      */
     public toolbar_click($event: any, $event2?: any) {
+        if (Object.is($event.tag, 'tbitem1_ckbb')) {
+            this.toolbar_tbitem1_ckbb_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
@@ -820,6 +834,35 @@ export default class DAReportEditViewBase extends Vue {
 
 
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem1_ckbb_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:DAReportUIService  = new DAReportUIService();
+        curUIService.DAReport_CKBB(datas,contextJO, paramJO,  $event, xData,this,"DAReport");
+    }
+
     /**
      * 逻辑事件
      *

app_web/src/pages/lite/dst-index/page-register.ts

@@ -28,6 +28,7 @@ export const PageComponents = {
         Vue.component('meta-entity-grid-view', () => import('@pages/lite/meta-entity-grid-view/meta-entity-grid-view.vue'));
         Vue.component('rule-item-grid-view', () => import('@pages/rule/rule-item-grid-view/rule-item-grid-view.vue'));
         Vue.component('dabuild-edit-view', () => import('@pages/analysis/dabuild-edit-view/dabuild-edit-view.vue'));
+        Vue.component('dareport-bbzscustom-view', () => import('@pages/analysis/dareport-bbzscustom-view/dareport-bbzscustom-view.vue'));
         Vue.component('rule-item-pickup-grid-view', () => import('@pages/rule/rule-item-pickup-grid-view/rule-item-pickup-grid-view.vue'));
         Vue.component('dst-system-edit-view', () => import('@pages/lite/dst-system-edit-view/dst-system-edit-view.vue'));
         Vue.component('dst-data-source-pickup-view', () => import('@pages/lite/dst-data-source-pickup-view/dst-data-source-pickup-view.vue'));
@@ -51,7 +52,7 @@ export const PageComponents = {
         Vue.component('meta-entity-edit-view', () => import('@pages/lite/meta-entity-edit-view/meta-entity-edit-view.vue'));
         Vue.component('dst-data-source-grid-view', () => import('@pages/lite/dst-data-source-grid-view/dst-data-source-grid-view.vue'));
         Vue.component('meta-model-file-upload-option-view', () => import('@pages/lite/meta-model-file-upload-option-view/meta-model-file-upload-option-view.vue'));
-        Vue.component('rule-engine-edit-view', () => import('@pages/rule/rule-engine-edit-view/rule-engine-edit-view.vue'));
         Vue.component('dict-catalog-pickup-view', () => import('@pages/dict/dict-catalog-pickup-view/dict-catalog-pickup-view.vue'));
+        Vue.component('rule-engine-edit-view', () => import('@pages/rule/rule-engine-edit-view/rule-engine-edit-view.vue'));
     }
 };
\ No newline at end of file

app_web/src/pages/lite/dst-index/router.ts

@@ -658,6 +658,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/analysis/dabuild-edit-view/dabuild-edit-view.vue'),
                 },
+                {
+                    path: 'dareports/:dareport?/bbzscustomview/:bbzscustomview?',
+                    meta: {
+                        caption: 'entities.dareport.views.bbzscustomview.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'dstindex', parameterName: 'dstindex' },
+                            { pathName: 'dareports', parameterName: 'dareport' },
+                            { pathName: 'bbzscustomview', parameterName: 'bbzscustomview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/analysis/dareport-bbzscustom-view/dareport-bbzscustom-view.vue'),
+                },
                 {
                     path: 'ruleitems/:ruleitem?/pickupgridview/:pickupgridview?',
                     meta: {
@@ -1180,32 +1194,32 @@ const router = new Router({
                     component: () => import('@pages/lite/meta-model-file-upload-option-view/meta-model-file-upload-option-view.vue'),
                 },
                 {
-                    path: 'ruleengines/:ruleengine?/editview/:editview?',
+                    path: 'dictcatalogs/:dictcatalog?/pickupview/:pickupview?',
                     meta: {
-                        caption: 'entities.ruleengine.views.editview.caption',
+                        caption: 'entities.dictcatalog.views.pickupview.caption',
                         info:'',
                         parameters: [
                             { pathName: 'dstindex', parameterName: 'dstindex' },
-                            { pathName: 'ruleengines', parameterName: 'ruleengine' },
-                            { pathName: 'editview', parameterName: 'editview' },
+                            { pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/rule/rule-engine-edit-view/rule-engine-edit-view.vue'),
+                    component: () => import('@pages/dict/dict-catalog-pickup-view/dict-catalog-pickup-view.vue'),
                 },
                 {
-                    path: 'dictcatalogs/:dictcatalog?/pickupview/:pickupview?',
+                    path: 'ruleengines/:ruleengine?/editview/:editview?',
                     meta: {
-                        caption: 'entities.dictcatalog.views.pickupview.caption',
+                        caption: 'entities.ruleengine.views.editview.caption',
                         info:'',
                         parameters: [
                             { pathName: 'dstindex', parameterName: 'dstindex' },
-                            { pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
-                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                            { pathName: 'ruleengines', parameterName: 'ruleengine' },
+                            { pathName: 'editview', parameterName: 'editview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/dict/dict-catalog-pickup-view/dict-catalog-pickup-view.vue'),
+                    component: () => import('@pages/rule/rule-engine-edit-view/rule-engine-edit-view.vue'),
                 },
             ...indexRoutes,
             ],
@@ -2246,6 +2260,19 @@ const router = new Router({
         },
         component: () => import('@pages/lite/meta-relationship-edit-grid-view/meta-relationship-edit-grid-view.vue'),
     },
+    {
+        path: '/dareports/:dareport?/bbzscustomview/:bbzscustomview?',
+        meta: {
+            caption: 'entities.dareport.views.bbzscustomview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'dareports', parameterName: 'dareport' },
+                { pathName: 'bbzscustomview', parameterName: 'bbzscustomview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/analysis/dareport-bbzscustom-view/dareport-bbzscustom-view.vue'),
+    },
     {
         path: '/ruleitems/:ruleitem?/pickupgridview/:pickupgridview?',
         meta: {

app_web/src/store/modules/view-action/state.ts

@@ -349,6 +349,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                'eba227704fadf322603ac46c2d3f2f8c',
             ],
         },
         {
@@ -533,6 +534,15 @@ export const viewstate: any = {
                 '601fb9bf6eec2a7e264e7142017715a4',
             ],
         },
+        {
+            viewtag: 'eba227704fadf322603ac46c2d3f2f8c',
+            viewmodule: 'analysis',
+            viewname: 'DAReportBBZSCustomView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: 'f5f5de8c3626605a2f61f1139583dc98',
             viewmodule: 'rule',

app_web/src/uiservice/dareport/dareport-ui-service-base.ts

@@ -117,6 +117,54 @@ export default class DAReportUIServiceBase extends UIService {
     public initDeMainStateOPPrivsMap(){
     }
 
+    /**
+     * 查看报表
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async DAReport_CKBB(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+    
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { dareport: '%dareport%' });
+        Object.assign(params, { report_id: '%dareport%' });
+        Object.assign(params, { report_name: '%report_name%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        let deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'dareports', parameterName: 'dareport' },
+            { pathName: 'bbzscustomview', parameterName: 'bbzscustomview' },
+        ];
+        const openIndexViewTab = (data: any) => {
+            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
+            actionContext.$router.push(routePath);
+            return null;
+        }
+        openIndexViewTab(data);
+    }
+
 
     /**
      * 获取指定数据的重定向页面