lab_gzf 发布系统代码

app_CRM/src/locale/lanres/entities/opportunity/opportunity_en_US.ts

@@ -193,6 +193,7 @@ export default {
 	abstractinfo_form: {
 		details: {
 			group1: "商机基本信息", 
+			grouppanel1: "详细信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -210,6 +211,7 @@ export default {
 			budgetamount: "预算金额", 
 			purchaseprocess: "采购程序", 
 			description: "说明", 
+			pricelevelname: "价目表", 
 			currentsituation: "当前状况", 
 			customerneed: "客户需求", 
 			proposedsolution: "已拟定解决方案", 
@@ -218,9 +220,9 @@ export default {
 		uiactions: {
 		},
 	},
-	productinfo_form: {
+	main_form: {
 		details: {
-			group1: "价目表信息", 
+			group1: "基本信息", 
 			druipart1: "", 
 			grouppanel1: "产品明细信息", 
 			formpage1: "基本信息", 
@@ -232,15 +234,30 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			opportunityname: "商机名称", 
+			parentcontactname: "联系人", 
+			parentaccountname: "帐户", 
+			purchasetimeframe: "购买时间范围", 
+			transactioncurrencyname: "货币", 
+			budgetamount: "预算金额", 
+			purchaseprocess: "采购程序", 
+			description: "说明", 
+			currentsituation: "当前状况", 
+			customerneed: "客户需求", 
+			proposedsolution: "已拟定解决方案", 
 			pricelevelname: "价目表", 
+			parentcontactid: "联系人", 
+			parentaccountid: "帐户", 
+			transactioncurrencyid: "货币", 
 			opportunityid: "商机", 
+			pricelevelid: "价目表", 
 		},
 		uiactions: {
 		},
 	},
-	main_form: {
+	productinfo_form: {
 		details: {
-			group1: "基本信息", 
+			group1: "价目表信息", 
 			druipart1: "", 
 			grouppanel1: "产品明细信息", 
 			formpage1: "基本信息", 
@@ -252,23 +269,8 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			opportunityname: "商机名称", 
-			parentcontactname: "联系人", 
-			parentaccountname: "帐户", 
-			purchasetimeframe: "购买时间范围", 
-			transactioncurrencyname: "货币", 
-			budgetamount: "预算金额", 
-			purchaseprocess: "采购程序", 
-			description: "说明", 
-			currentsituation: "当前状况", 
-			customerneed: "客户需求", 
-			proposedsolution: "已拟定解决方案", 
 			pricelevelname: "价目表", 
-			parentcontactid: "联系人", 
-			parentaccountid: "帐户", 
-			transactioncurrencyid: "货币", 
 			opportunityid: "商机", 
-			pricelevelid: "价目表", 
 		},
 		uiactions: {
 		},

app_CRM/src/locale/lanres/entities/opportunity/opportunity_zh_CN.ts

@@ -192,6 +192,7 @@ export default {
 	abstractinfo_form: {
 		details: {
 			group1: "商机基本信息", 
+			grouppanel1: "详细信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -209,6 +210,7 @@ export default {
 			budgetamount: "预算金额", 
 			purchaseprocess: "采购程序", 
 			description: "说明", 
+			pricelevelname: "价目表", 
 			currentsituation: "当前状况", 
 			customerneed: "客户需求", 
 			proposedsolution: "已拟定解决方案", 
@@ -217,9 +219,9 @@ export default {
 		uiactions: {
 		},
 	},
-	productinfo_form: {
+	main_form: {
 		details: {
-			group1: "价目表信息", 
+			group1: "基本信息", 
 			druipart1: "", 
 			grouppanel1: "产品明细信息", 
 			formpage1: "基本信息", 
@@ -231,15 +233,30 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			opportunityname: "商机名称", 
+			parentcontactname: "联系人", 
+			parentaccountname: "帐户", 
+			purchasetimeframe: "购买时间范围", 
+			transactioncurrencyname: "货币", 
+			budgetamount: "预算金额", 
+			purchaseprocess: "采购程序", 
+			description: "说明", 
+			currentsituation: "当前状况", 
+			customerneed: "客户需求", 
+			proposedsolution: "已拟定解决方案", 
 			pricelevelname: "价目表", 
+			parentcontactid: "联系人", 
+			parentaccountid: "帐户", 
+			transactioncurrencyid: "货币", 
 			opportunityid: "商机", 
+			pricelevelid: "价目表", 
 		},
 		uiactions: {
 		},
 	},
-	main_form: {
+	productinfo_form: {
 		details: {
-			group1: "基本信息", 
+			group1: "价目表信息", 
 			druipart1: "", 
 			grouppanel1: "产品明细信息", 
 			formpage1: "基本信息", 
@@ -251,23 +268,8 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			opportunityname: "商机名称", 
-			parentcontactname: "联系人", 
-			parentaccountname: "帐户", 
-			purchasetimeframe: "购买时间范围", 
-			transactioncurrencyname: "货币", 
-			budgetamount: "预算金额", 
-			purchaseprocess: "采购程序", 
-			description: "说明", 
-			currentsituation: "当前状况", 
-			customerneed: "客户需求", 
-			proposedsolution: "已拟定解决方案", 
 			pricelevelname: "价目表", 
-			parentcontactid: "联系人", 
-			parentaccountid: "帐户", 
-			transactioncurrencyid: "货币", 
 			opportunityid: "商机", 
-			pricelevelid: "价目表", 
 		},
 		uiactions: {
 		},

app_CRM/src/pages/ungroup/central/page-register.ts

@@ -21,7 +21,6 @@ export const PageComponents = {
         Vue.component('task-quick-create', () => import('@pages/base/task-quick-create/task-quick-create.vue'));
         Vue.component('opportunity-quick-create', () => import('@pages/sales/opportunity-quick-create/opportunity-quick-create.vue'));
         Vue.component('product-price-level-pro-prilv-edit-view', () => import('@pages/product/product-price-level-pro-prilv-edit-view/product-price-level-pro-prilv-edit-view.vue'));
-        Vue.component('opportunity-info-product', () => import('@pages/sales/opportunity-info-product/opportunity-info-product.vue'));
         Vue.component('invoice-quick-create-view', () => import('@pages/finance/invoice-quick-create-view/invoice-quick-create-view.vue'));
         Vue.component('opportunity-competitor-opp-comp-grid-view', () => import('@pages/sales/opportunity-competitor-opp-comp-grid-view/opportunity-competitor-opp-comp-grid-view.vue'));
         Vue.component('goal-info-goal-view', () => import('@pages/sales/goal-info-goal-view/goal-info-goal-view.vue'));
@@ -82,8 +81,8 @@ export const PageComponents = {
         Vue.component('competitor-grid-view', () => import('@pages/sales/competitor-grid-view/competitor-grid-view.vue'));
         Vue.component('account-summary', () => import('@pages/base/account-summary/account-summary.vue'));
         Vue.component('sales-literature-info-view', () => import('@pages/sales/sales-literature-info-view/sales-literature-info-view.vue'));
-        Vue.component('opportunity-product-opp-opp-pro-grid-view', () => import('@pages/sales/opportunity-product-opp-opp-pro-grid-view/opportunity-product-opp-opp-pro-grid-view.vue'));
         Vue.component('ibiz-list-quick-create', () => import('@pages/marketing/ibiz-list-quick-create/ibiz-list-quick-create.vue'));
+        Vue.component('opportunity-product-opp-opp-pro-grid-view', () => import('@pages/sales/opportunity-product-opp-opp-pro-grid-view/opportunity-product-opp-opp-pro-grid-view.vue'));
         Vue.component('product-association-grid-view', () => import('@pages/product/product-association-grid-view/product-association-grid-view.vue'));
         Vue.component('appointment-quick-create', () => import('@pages/base/appointment-quick-create/appointment-quick-create.vue'));
         Vue.component('quote-detail-quo-detail-grid-view', () => import('@pages/sales/quote-detail-quo-detail-grid-view/quote-detail-quo-detail-grid-view.vue'));
@@ -129,7 +128,6 @@ export const PageComponents = {
         Vue.component('quote-opp-qua-grid-view', () => import('@pages/sales/quote-opp-qua-grid-view/quote-opp-qua-grid-view.vue'));
         Vue.component('invoice-info-view', () => import('@pages/finance/invoice-info-view/invoice-info-view.vue'));
         Vue.component('contact-by-account', () => import('@pages/base/contact-by-account/contact-by-account.vue'));
-        Vue.component('opportunity-opp-pro-dashboard-view', () => import('@pages/sales/opportunity-opp-pro-dashboard-view/opportunity-opp-pro-dashboard-view.vue'));
         Vue.component('ibiz-list-summary', () => import('@pages/marketing/ibiz-list-summary/ibiz-list-summary.vue'));
         Vue.component('sales-literature-item-grid-view', () => import('@pages/sales/sales-literature-item-grid-view/sales-literature-item-grid-view.vue'));
         Vue.component('lead-dashboard-view', () => import('@pages/sales/lead-dashboard-view/lead-dashboard-view.vue'));

app_CRM/src/pages/ungroup/central/router.ts

@@ -528,51 +528,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/product/product-price-level-pro-prilv-edit-view/product-price-level-pro-prilv-edit-view.vue'),
                 },
-                {
-                    path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/info_product/:info_product?',
-                    meta: {
-                        caption: 'entities.opportunity.views.info_product.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'accounts', parameterName: 'account' },
-                            { pathName: 'contacts', parameterName: 'contact' },
-                            { pathName: 'opportunities', parameterName: 'opportunity' },
-                            { pathName: 'info_product', parameterName: 'info_product' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/sales/opportunity-info-product/opportunity-info-product.vue'),
-                },
-                {
-                    path: 'contacts/:contact?/opportunities/:opportunity?/info_product/:info_product?',
-                    meta: {
-                        caption: 'entities.opportunity.views.info_product.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'contacts', parameterName: 'contact' },
-                            { pathName: 'opportunities', parameterName: 'opportunity' },
-                            { pathName: 'info_product', parameterName: 'info_product' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/sales/opportunity-info-product/opportunity-info-product.vue'),
-                },
-                {
-                    path: 'opportunities/:opportunity?/info_product/:info_product?',
-                    meta: {
-                        caption: 'entities.opportunity.views.info_product.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'opportunities', parameterName: 'opportunity' },
-                            { pathName: 'info_product', parameterName: 'info_product' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/sales/opportunity-info-product/opportunity-info-product.vue'),
-                },
                 {
                     path: 'invoices/:invoice?/quickcreateview/:quickcreateview?',
                     meta: {
@@ -2095,6 +2050,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/sales/sales-literature-info-view/sales-literature-info-view.vue'),
                 },
+                {
+                    path: 'ibizlists/:ibizlist?/quickcreate/:quickcreate?',
+                    meta: {
+                        caption: 'entities.ibizlist.views.quickcreate.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'ibizlists', parameterName: 'ibizlist' },
+                            { pathName: 'quickcreate', parameterName: 'quickcreate' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/marketing/ibiz-list-quick-create/ibiz-list-quick-create.vue'),
+                },
                 {
                     path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/opportunityproducts/:opportunityproduct?/opp_oppprogridview/:opp_oppprogridview?',
                     meta: {
@@ -2157,20 +2126,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/sales/opportunity-product-opp-opp-pro-grid-view/opportunity-product-opp-opp-pro-grid-view.vue'),
                 },
-                {
-                    path: 'ibizlists/:ibizlist?/quickcreate/:quickcreate?',
-                    meta: {
-                        caption: 'entities.ibizlist.views.quickcreate.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'ibizlists', parameterName: 'ibizlist' },
-                            { pathName: 'quickcreate', parameterName: 'quickcreate' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/marketing/ibiz-list-quick-create/ibiz-list-quick-create.vue'),
-                },
                 {
                     path: 'products/:product?/productassociations/:productassociation?/gridview/:gridview?',
                     meta: {
@@ -3467,51 +3422,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/contact-by-account/contact-by-account.vue'),
                 },
-                {
-                    path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/oppprodashboardview/:oppprodashboardview?',
-                    meta: {
-                        caption: 'entities.opportunity.views.oppprodashboardview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'accounts', parameterName: 'account' },
-                            { pathName: 'contacts', parameterName: 'contact' },
-                            { pathName: 'opportunities', parameterName: 'opportunity' },
-                            { pathName: 'oppprodashboardview', parameterName: 'oppprodashboardview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/sales/opportunity-opp-pro-dashboard-view/opportunity-opp-pro-dashboard-view.vue'),
-                },
-                {
-                    path: 'contacts/:contact?/opportunities/:opportunity?/oppprodashboardview/:oppprodashboardview?',
-                    meta: {
-                        caption: 'entities.opportunity.views.oppprodashboardview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'contacts', parameterName: 'contact' },
-                            { pathName: 'opportunities', parameterName: 'opportunity' },
-                            { pathName: 'oppprodashboardview', parameterName: 'oppprodashboardview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/sales/opportunity-opp-pro-dashboard-view/opportunity-opp-pro-dashboard-view.vue'),
-                },
-                {
-                    path: 'opportunities/:opportunity?/oppprodashboardview/:oppprodashboardview?',
-                    meta: {
-                        caption: 'entities.opportunity.views.oppprodashboardview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'opportunities', parameterName: 'opportunity' },
-                            { pathName: 'oppprodashboardview', parameterName: 'oppprodashboardview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/sales/opportunity-opp-pro-dashboard-view/opportunity-opp-pro-dashboard-view.vue'),
-                },
                 {
                     path: 'salesliteratures/:salesliterature?/competitorsalesliteratures/:competitorsalesliterature?/sallitcompgridview/:sallitcompgridview?',
                     meta: {

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

@@ -1123,10 +1123,10 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '9693fc63348c320c4b0dff17cb9a9f25',
                 '177c00d1674621e8933efe6db68bce0e',
                 '7bf35293fd1d9db7816755a74c4d575e',
                 '78862ad65295f145e7520291f1183604',
+                '6c67094479c2f8af7ea1575eee584056',
             ],
         },
         {
@@ -1212,16 +1212,6 @@ export const viewstate: any = {
                 'a5213905238dbc5d8e1a505029105cc9',
             ],
         },
-        {
-            viewtag: '9693fc63348c320c4b0dff17cb9a9f25',
-            viewmodule: 'Sales',
-            viewname: 'OpportunityOppProDashboardView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                'c74c14188b89f72079643170a83c25f5',
-            ],
-        },
         {
             viewtag: '96cc644d7d763e47f3644aed0d9850f0',
             viewmodule: 'Sales',
@@ -1656,16 +1646,6 @@ export const viewstate: any = {
             refviews: [
             ],
         },
-        {
-            viewtag: 'c74c14188b89f72079643170a83c25f5',
-            viewmodule: 'Sales',
-            viewname: 'OpportunityInfo_Product',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '6c67094479c2f8af7ea1575eee584056',
-            ],
-        },
         {
             viewtag: 'c7d0ca0f6fa1b27bbd1b5c422d1a108d',
             viewmodule: 'Marketing',

app_CRM/src/uiservice/opportunity/opportunity-ui-service-base.ts

@@ -206,6 +206,7 @@ export default class OpportunityUIServiceBase extends UIService {
         const parameters: any[] = [
             { pathName: 'opportunities', parameterName: 'opportunity' },
         ];
+            actionContext.closeView(null);
             const openDrawer = (view: any, data: any) => {
                 let container: Subject<any> = actionContext.$appdrawer.openDrawer(view, context,data);
                 container.subscribe((result: any) => {
@@ -213,6 +214,12 @@ export default class OpportunityUIServiceBase extends UIService {
                         return;
                     }
                     const _this: any = actionContext;
+                    if (xData && xData.refresh && xData.refresh instanceof Function) {
+                        xData.refresh(args);
+                    }
+                    if (this.Opportunity_OpenInfoView && this.Opportunity_OpenInfoView instanceof Function) {
+                        this.Opportunity_OpenInfoView(result.datas,context,params, $event, xData,actionContext);
+                    }
                     if(window.opener){
                         window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
                         window.close();
@@ -294,6 +301,59 @@ export default class OpportunityUIServiceBase extends UIService {
         backend();
     }
 
+    /**
+     * 打开主信息界面
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async Opportunity_OpenInfoView(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, { opportunity: '%opportunity%' });
+        Object.assign(params, { opportunityid: '%opportunity%' });
+        Object.assign(params, { opportunityname: '%opportunityname%' });
+        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[] = [];
+        if(context.contact && true){
+            deResParameters = [
+            { pathName: 'contacts', parameterName: 'contact' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'opportunities', parameterName: 'opportunity' },
+            { pathName: 'info', parameterName: 'info' },
+        ];
+        const openIndexViewTab = (data: any) => {
+            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
+            actionContext.$router.push(routePath);
+            return null;
+        }
+        openIndexViewTab(data);
+    }
+
     /**
      * 编辑
      *

app_CRM/src/widgets/lead/view-lead-con-portlet/view-lead-con-portlet.html

 <div class='portlet view-lead-con ' :style="{}">
-        <p class='portlet-title'>
-            <span>
-            
-            联系人
-            </span>
-        </p>
-        <div class="portlet-with-title">
+        <div class="portlet-without-title">
         <lead-info-contact :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></lead-info-contact>
         </div>
 </div>

app_CRM/src/widgets/opportunity/abstract-info-dashboard/abstract-info-dashboard.html

@@ -6,7 +6,7 @@
       <i-col :md="{ span: 24, offset: 0 }" :lg="{ span: 18, offset: 0 }">
         <card class="portlet-card" :bordered="false" dis-hover :padding="0">
           <span>
-                      <div class='portlet-container summarydashboard-container1 ' :style="{}">
+                      <div class='portlet-container summarydashboard-container1  portlet-container-no-border' :style="{}">
                 <row>
                   <i-col :md="{ span: 24, offset: 0 }">
                       <div class="portlet-without-title">

app_CRM/src/widgets/opportunity/abstract-info-form/abstract-info-form-base.tsx

@@ -63,6 +63,7 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
         budgetamount: null,
         purchaseprocess: null,
         description: null,
+        pricelevelname: null,
         currentsituation: null,
         customerneed: null,
         proposedsolution: null,
@@ -86,7 +87,9 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
      * @memberof AbstractInfoEditFormBase
      */
     public detailsModel: any = {
-        group1: new FormGroupPanelModel({ caption: '商机基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, uiActionGroup: { caption: '', langbase: 'entities.opportunity.abstractinfo_form', extractMode: 'ITEM', details: [] } }),
+        group1: new FormGroupPanelModel({ caption: '商机基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, uiActionGroup: { caption: '', langbase: 'entities.opportunity.abstractinfo_form', extractMode: 'ITEM', details: [] } }),
+
+        grouppanel1: new FormGroupPanelModel({ caption: '详细信息', detailType: 'GROUPPANEL', name: 'grouppanel1', visible: true, isShowCaption: true, form: this, uiActionGroup: { caption: '', langbase: 'entities.opportunity.abstractinfo_form', extractMode: 'ITEM', details: [] } }),
 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this }),
 
@@ -122,6 +125,8 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
 
         description: new FormItemModel({ caption: '说明', detailType: 'FORMITEM', name: 'description', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
+        pricelevelname: new FormItemModel({ caption: '价目表', detailType: 'FORMITEM', name: 'pricelevelname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
         currentsituation: new FormItemModel({ caption: '当前状况', detailType: 'FORMITEM', name: 'currentsituation', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
         customerneed: new FormItemModel({ caption: '客户需求', detailType: 'FORMITEM', name: 'customerneed', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),

app_CRM/src/widgets/opportunity/abstract-info-form/abstract-info-form-model.ts

@@ -95,6 +95,11 @@ export default class AbstractInfoModel {
         prop: 'description',
         dataType: 'TEXT',
       },
+      {
+        name: 'pricelevelname',
+        prop: 'pricelevelname',
+        dataType: 'PICKUPTEXT',
+      },
       {
         name: 'currentsituation',
         prop: 'currentsituation',

app_CRM/src/widgets/opportunity/abstract-info-form/abstract-info-form.html

@@ -3,7 +3,7 @@
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.opportunity.abstractinfo_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.opportunity.abstractinfo_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <i-col v-show="detailsModel.opportunityname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='opportunityname' :itemRules="this.rules.opportunityname" class='' :caption="$t('entities.opportunity.abstractinfo_form.details.opportunityname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.opportunityname.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -60,6 +60,21 @@
 <app-span name='description' :value="data.description" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
+</i-col>
+    
+    </row>
+</app-form-group>
+
+</i-col>
+<i-col v-show="detailsModel.grouppanel1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.opportunity.abstractinfo_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" >    
+    <row>
+        <i-col v-show="detailsModel.pricelevelname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='pricelevelname' :itemRules="this.rules.pricelevelname" class='' :caption="$t('entities.opportunity.abstractinfo_form.details.pricelevelname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pricelevelname.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-span name='pricelevelname' :value="data.pricelevelname" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.currentsituation.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
     <app-form-item name='currentsituation' :itemRules="this.rules.currentsituation" class='' :caption="$t('entities.opportunity.abstractinfo_form.details.currentsituation')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.currentsituation.error" :isEmptyCaption="false" labelPos="LEFT">

app_CRM/src/widgets/opportunity/infotabviewpanel2-tabviewpanel/infotabviewpanel2-tabviewpanel.html

 <div class='tabviewpanel' v-if='isActivied'>
-        <opportunity-opp-pro-dashboard-view 
+        <opportunity-product-opp-opp-pro-grid-view 
       class='viewcontainer2' 
       :viewdata="viewdata" 
       :viewparam="viewparam"
       @viewload="viewDatasChange($event)" 
       :viewDefaultUsage="false" >
-    </opportunity-opp-pro-dashboard-view>
+    </opportunity-product-opp-opp-pro-grid-view>
 </div>
\ No newline at end of file

app_CRM/src/widgets/opportunity/view-opp-abs-portlet/view-opp-abs-portlet.html

 <div class='portlet view-opp-abs ' :style="{}">
-        <p class='portlet-title'>
-            <span>
-            
-            摘要信息
-            </span>
-        </p>
-        <div class="portlet-with-title">
+        <div class="portlet-without-title">
         <opportunity-info-abstract :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></opportunity-info-abstract>
         </div>
 </div>

businesscentral-core/src/main/resources/liquibase/h2_table.xml

@@ -5948,7 +5948,7 @@
 
 
     <!--输出实体[OPPORTUNITYPRODUCT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-opportunityproduct-9-67">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-opportunityproduct-10-67">
         <createTable tableName="OPPORTUNITYPRODUCT">
                 <column name="PRICEOVERRIDDEN" remarks="" type="INT">
                 </column>
@@ -10506,7 +10506,7 @@
 
 
     <!--输出实体[OPPORTUNITY]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-opportunity-124-124">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-opportunity-132-124">
         <createTable tableName="OPPORTUNITY">
                 <column name="DECISIONMAKER" remarks="" type="INT">
                 </column>
@@ -11365,16 +11365,16 @@
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="EXPIREDPROCESS" constraintName="DER1N_EXPIREDPROCESS__TRANSACT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[OPPORTUNITYPRODUCT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunityproduct-9-297">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunityproduct-10-297">
        <addForeignKeyConstraint baseColumnNames="PARENTBUNDLEIDREF" baseTableName="OPPORTUNITYPRODUCT" constraintName="DER1N_OPPORTUNITYPRODUCT__OPPO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OPPORTUNITYPRODUCTID" referencedTableName="OPPORTUNITYPRODUCT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunityproduct-9-299">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunityproduct-10-299">
        <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="OPPORTUNITYPRODUCT" constraintName="DER1N_OPPORTUNITYPRODUCT__PROD" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunityproduct-9-300">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunityproduct-10-300">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="OPPORTUNITYPRODUCT" constraintName="DER1N_OPPORTUNITYPRODUCT__TRAN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunityproduct-9-301">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunityproduct-10-301">
        <addForeignKeyConstraint baseColumnNames="UOMID" baseTableName="OPPORTUNITYPRODUCT" constraintName="DER1N_OPPORTUNITYPRODUCT__UOM_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="UOMID" referencedTableName="UOM" validate="true"/>
     </changeSet>
         <!--输出实体[POSITION]外键关系 -->
@@ -11740,25 +11740,25 @@
         <!--输出实体[RELATIONSHIPS]外键关系 -->
         <!--输出实体[CONNECTIONROLE]外键关系 -->
         <!--输出实体[OPPORTUNITY]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-124-414">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-132-414">
        <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__ACCOUNT__PA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-124-415">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-132-415">
        <addForeignKeyConstraint baseColumnNames="CAMPAIGNID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__CAMPAIGN__C" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CAMPAIGNID" referencedTableName="CAMPAIGN" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-124-416">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-132-416">
        <addForeignKeyConstraint baseColumnNames="PARENTCONTACTID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__CONTACT__PA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-124-417">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-132-417">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__LEAD__ORIGI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-124-418">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-132-418">
        <addForeignKeyConstraint baseColumnNames="PRICELEVELID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__PRICELEVEL_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-124-419">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-132-419">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-124-420">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-132-420">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__TRANSACTION" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[OPPORTUNITYCOMPETITOR]外键关系 -->