xignzi006 发布系统代码

app_BusinessCentral/public/assets/json/data-dictionary.json

  [
         {
+        "srfkey": "Status",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "1",
+                "label": "Active",
+                "text": "Active",
+                "data":"",
+                "codename":"Item_1",
+                "value": 1,
+                
+                "disabled": false
+            }
+            , {
+                "id": "2",
+                "label": "Inactive",
+                "text": "Inactive",
+                "data":"",
+                "codename":"Item_2",
+                "value": 2,
+                
+                "disabled": false
+            }
+        ]
+    }, 
+    {
         "srfkey": "SysOperator",
         "emptytext": "未定义",
         "codelisttype":"dynamic",

app_BusinessCentral/src/locale/lanres/codelist/codelist_en_US.ts

 export default {
+    Status: {
+        '1': 'Active',
+        '2': 'Inactive',
+        empty: '',
+    },
     SysOperator: {
         empty: '',
     },

app_BusinessCentral/src/locale/lanres/codelist/codelist_zh_CN.ts

 export default {
+    Status: {
+        '1': 'Active',
+        '2': 'Inactive',
+        empty: '',
+    },
     SysOperator: {
         empty: '',
     },

app_BusinessCentral/src/locale/lanres/entities/contact/contact_en_US.ts

@@ -415,6 +415,10 @@ export default {
 			caption: "编辑",
 			tip: "编辑",
 		},
+		deuiaction4: {
+			caption: "关闭",
+			tip: "关闭",
+		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {

app_BusinessCentral/src/locale/lanres/entities/contact/contact_zh_CN.ts

@@ -414,6 +414,10 @@ export default {
 			caption: '编辑',
 			tip: '编辑',
 		},
+		deuiaction4: {
+			caption: '关闭',
+			tip: '关闭',
+		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {

app_BusinessCentral/src/locale/lanres/entities/lead/lead_en_US.ts

@@ -202,8 +202,8 @@ export default {
 	main_grid: {
 		columns: {
 			fullname: "姓名",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			subject: "主题",
+			statuscode: "状态描述",
 		},
 		uiactions: {
 		},

app_BusinessCentral/src/locale/lanres/entities/lead/lead_zh_CN.ts

@@ -201,8 +201,8 @@ export default {
 	main_grid: {
 		columns: {
 			fullname: '姓名',
-			updateman: '更新人',
-			updatedate: '更新时间',
+			subject: '主题',
+			statuscode: '状态描述',
 		},
 		uiactions: {
 		},

app_BusinessCentral/src/mock/codelist/codelist.ts

@@ -8,6 +8,33 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
     let status = MockAdapter.mockStatus(config);
     return [status, [
         {
+        srfkey: 'Status',
+        emptytext: '未定义',
+        "codelisttype":"static",
+        items: [
+            {
+                id: '1',
+                label: 'Active',
+                text: 'Active',
+                "data":"",
+                "codename":"Item_1",
+                value: 1,
+                
+                disabled: false,
+            },
+            {
+                id: '2',
+                label: 'Inactive',
+                text: 'Inactive',
+                "data":"",
+                "codename":"Item_2",
+                value: 2,
+                
+                disabled: false,
+            },
+        ]
+    },
+    {
         "srfkey": "SysOperator",
         "emptytext": "未定义",
         "codelisttype":"dynamic",

app_BusinessCentral/src/pages/base/contact-abstract-edit-view9/contact-abstract-edit-view9-base.vue

@@ -6,6 +6,10 @@
                     <i class='fa fa-edit'></i>
                     <span class='caption'>{{$t('entities.contact.abstracteditview9toolbar_toolbar.deuiaction2.caption')}}</span>
                 </i-button>
+            <i-button :title="$t('entities.contact.abstracteditview9toolbar_toolbar.deuiaction4.tip')" v-show="toolBarModels.deuiaction4.visabled" :disabled="toolBarModels.deuiaction4.disabled" class='' @click="toolbar_click({ tag: 'deuiaction4' }, $event)">
+                    <i class='fa fa-sign-out'></i>
+                    <span class='caption'>{{$t('entities.contact.abstracteditview9toolbar_toolbar.deuiaction4.caption')}}</span>
+                </i-button>
         </div>
     </template>
     <view_form 
@@ -222,6 +226,8 @@ export default class ContactAbstractEditView9Base extends Vue {
     public toolBarModels: any = {
         deuiaction2: { name: 'deuiaction2', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'OpenEditMode', target: 'SINGLEKEY' } },
 
+        deuiaction4: { name: 'deuiaction4', caption: '关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Exit', target: '' } },
+
     };
 
 
@@ -468,6 +474,9 @@ export default class ContactAbstractEditView9Base extends Vue {
         if (Object.is($event.tag, 'deuiaction2')) {
             this.toolbar_deuiaction2_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction4')) {
+            this.toolbar_deuiaction4_click(null, '', $event2);
+        }
     }
 
 
@@ -536,6 +545,34 @@ export default class ContactAbstractEditView9Base extends Vue {
         this.OpenEditMode(datas, contextJO,paramJO,  $event, xData,this,"Contact");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction4_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];
+        }
+        // 界面行为
+        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"Contact");
+    }
+
     /**
      * 编辑
      *
@@ -603,6 +640,24 @@ export default class ContactAbstractEditView9Base extends Vue {
 
     }
 
+    /**
+     * 关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof ContactAbstractEditView9Base
+     */
+    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.closeView(args);
+        if(window.parent){
+            window.parent.postMessage([{ ...args }],'*');
+        }
+    }
+
 
     /**
      * 关闭视图

app_BusinessCentral/src/pages/base/contact-grid-view/contact-grid-view-base.vue

@@ -920,14 +920,28 @@ export default class ContactGridViewBase extends Vue {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'contacts', parameterName: 'contact' },
-            { pathName: 'tabexpview', parameterName: 'tabexpview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'contact-tab-exp-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.contact.views.tabexpview.title'),
+            placement: 'DRAWER_TOP',
+        };
+        openDrawer(view, data);
     }
 
 

app_BusinessCentral/src/pages/base/contact-tab-exp-view/contact-tab-exp-view-base.vue

  
 <template>
 <studio-view viewName="contacttabexpview" viewTitle="联系人分页导航视图" class='detabexpview contact-tab-exp-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <view_tabexppanel 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_BusinessCentral/src/pages/sales/lead-grid-view/lead-grid-view-base.vue

 <template>
 <studio-view viewName="leadgridview" viewTitle="lead表格视图" class='degridview lead-grid-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
     <template slot="toolbar">
                 <div class='toolbar-container'>

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

@@ -106,18 +106,19 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                'aa79d35850f36fbc1a5085353ecd5af5',
                 'e38e7b53a449e0f112cb545d2c5d4b85',
+                'aa79d35850f36fbc1a5085353ecd5af5',
                 'fb06f2c1cea1ac2a5a70c20f4a277ae5',
                 '73bb9f7e653384ca09f8bbbfd580d892',
+                'e404dc93e70d6284d4e1a083017625ed',
+                'a95d7d9111bc13a8b73a11ee1e4ff92a',
+                '916febbb65be1c54dd42ccb9914fe973',
+                'a5213905238dbc5d8e1a505029105cc9',
                 'e4335da0a7c14a65376eecaabb771fd7',
                 'c607e5bc2c07ab2aca084e275ce677b7',
-                'a95d7d9111bc13a8b73a11ee1e4ff92a',
                 '893e62d6fbdc4580de7e3e802aec9108',
-                '916febbb65be1c54dd42ccb9914fe973',
-                '1d3b94223a5d3f8ab1d2fe334c8c4afd',
                 '688201ee5642d41628dbf4deba002d17',
-                'a5213905238dbc5d8e1a505029105cc9',
+                '1d3b94223a5d3f8ab1d2fe334c8c4afd',
             ],
         },
         {

app_BusinessCentral/src/widgets/account/pt-major-contact-portlet/pt-major-contact-portlet-base.vue

@@ -14,6 +14,7 @@ import { UIActionTool,Util } from '@/utils';
 import AccountService from '@/service/account/account-service';
 import PT_MajorContactService from './pt-major-contact-portlet-service';
 
+import ContactUIService from '@/uiservice/contact/contact-ui-service';
 import { Environment } from '@/environments/environment';
 
 
@@ -102,6 +103,34 @@ export default class AccountPT_MajorContactBase extends Vue implements ControlIn
     public appEntityService: AccountService = new AccountService({ $store: this.$store });
     
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public dashboard_sysportlet6_u5a905ee_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;
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:ContactUIService  = new ContactUIService();
+        curUIService.Contact_OpenQuickCreateView(datas,contextJO, paramJO,  $event, xData,this,"Account");
+    }
+
 
     /**
      * 关闭视图
@@ -225,6 +254,16 @@ export default class AccountPT_MajorContactBase extends Vue implements ControlIn
         }
     }
 
+    /**
+     * 执行界面行为
+     *
+     * @memberof PT_MajorContactBase
+     */
+    public uiAction(tag:string,event:any){
+        if(Object.is(tag,'u5a905ee')){
+            this.dashboard_sysportlet6_u5a905ee_click(null,tag,event);
+        }
+    }
 
 }
 </script>

app_BusinessCentral/src/widgets/lead/main-grid/main-grid-base.vue

@@ -35,29 +35,29 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.lead.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('subject')">
+                <el-table-column show-overflow-tooltip :prop="'subject'" :label="$t('entities.lead.main_grid.columns.subject')" :width="100"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.lead.main_grid.columns.updateman')}}
+                        {{$t('entities.lead.main_grid.columns.subject')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
-                        </template>
+                        <span>{{row.subject}}</span>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.lead.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('statuscode')">
+                <el-table-column show-overflow-tooltip :prop="'statuscode'" :label="$t('entities.lead.main_grid.columns.statuscode')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.lead.main_grid.columns.updatedate')}}
+                        {{$t('entities.lead.main_grid.columns.statuscode')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <app-format-data format="YYYY-MM-DD hh:mm:ss" :data="row.updatedate"></app-format-data>
+                        <template >
+            <codelist :value="row.statuscode" tag='Status' codelistType='STATIC' ></codelist>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -546,16 +546,16 @@ export default class MainBase extends Vue implements ControlInterface {
             util: 'PX'
         },
         {
-            name: 'updateman',
-            label: '更新人',
-            langtag: 'entities.lead.main_grid.columns.updateman',
+            name: 'subject',
+            label: '主题',
+            langtag: 'entities.lead.main_grid.columns.subject',
             show: true,
             util: 'PX'
         },
         {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.lead.main_grid.columns.updatedate',
+            name: 'statuscode',
+            label: '状态描述',
+            langtag: 'entities.lead.main_grid.columns.statuscode',
             show: true,
             util: 'PX'
         },
@@ -947,9 +947,9 @@ export default class MainBase extends Vue implements ControlInterface {
     public async formatExcelData(filterVal:any, jsonData:any) {
         let codelistColumns:Array<any> = [
           {
-            name: 'updateman',
-            srfkey: 'SysOperator',
-            codelistType : 'DYNAMIC',
+            name: 'statuscode',
+            srfkey: 'Status',
+            codelistType : 'STATIC',
             renderMode: 'other',
             textSeparator: '、',
             valueSeparator: ',',

app_BusinessCentral/src/widgets/lead/main-grid/main-grid-model.ts

@@ -37,8 +37,8 @@ export default class MainModel {
           dataType: 'PICKUP',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
+          name: 'subject',
+          prop: 'subject',
           dataType: 'TEXT',
         },
         {
@@ -76,16 +76,16 @@ export default class MainModel {
           prop: 'parentaccountid',
           dataType: 'PICKUP',
         },
-        {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
-        },
         {
           name: 'campaignid',
           prop: 'campaignid',
           dataType: 'PICKUP',
         },
+        {
+          name: 'statuscode',
+          prop: 'statuscode',
+          dataType: 'NSCODELIST',
+        },
         {
           name: 'fullname',
           prop: 'fullname',