lab_gzf 发布系统代码

app_CRM/src/locale/lanres/entities/quote/quote_en_US.ts

@@ -209,9 +209,6 @@ export default {
 			shippingmethodcode: "送货方式", 
 			shipto_postalcode: "送货地的邮政编码", 
 			willcall: "送货地址", 
-			transactioncurrencyid: "货币", 
-			opportunityid: "商机", 
-			pricelevelid: "价目表", 
 			quoteid: "报价单", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/quote/quote_zh_CN.ts

@@ -208,9 +208,6 @@ export default {
 			shippingmethodcode: "送货方式", 
 			shipto_postalcode: "送货地的邮政编码", 
 			willcall: "送货地址", 
-			transactioncurrencyid: "货币", 
-			opportunityid: "商机", 
-			pricelevelid: "价目表", 
 			quoteid: "报价单", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/sales-literature/sales-literature_en_US.ts

@@ -77,7 +77,6 @@ export default {
 			subjectname: "主题", 
 			literaturetypecode: "类型", 
 			description: "说明", 
-			subjectid: "主题", 
 			salesliteratureid: "销售宣传资料", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/sales-literature/sales-literature_zh_CN.ts

@@ -76,7 +76,6 @@ export default {
 			subjectname: "主题", 
 			literaturetypecode: "类型", 
 			description: "说明", 
-			subjectid: "主题", 
 			salesliteratureid: "销售宣传资料", 
 		},
 		uiactions: {

app_CRM/src/pages/finance/invoice-detail-invoice-pro-grid-view/invoice-detail-invoice-pro-grid-view-base.tsx

@@ -441,16 +441,27 @@ export class InvoiceDetailInvoiceProGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'invoicedetails', parameterName: 'invoicedetail' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(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: 'invoice-detail-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.invoicedetail.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -480,14 +491,27 @@ export class InvoiceDetailInvoiceProGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'invoicedetails', parameterName: 'invoicedetail' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         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 openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(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: 'invoice-detail-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.invoicedetail.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_CRM/src/pages/product/product-association-grid-view/product-association-grid-view-base.tsx

@@ -440,16 +440,27 @@ export class ProductAssociationGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'productassociations', parameterName: 'productassociation' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(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: 'product-association-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.productassociation.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -479,14 +490,27 @@ export class ProductAssociationGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'productassociations', parameterName: 'productassociation' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         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 openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(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: 'product-association-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.productassociation.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_CRM/src/pages/product/product-price-level-pro-prilv-grid-view/product-price-level-pro-prilv-grid-view-base.tsx

@@ -440,16 +440,27 @@ export class ProductPriceLevelProPrilvGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'productpricelevels', parameterName: 'productpricelevel' },
-            { pathName: 'proprilveditview', parameterName: 'proprilveditview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(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: 'product-price-level-pro-prilv-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.productpricelevel.views.proprilveditview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -479,14 +490,27 @@ export class ProductPriceLevelProPrilvGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'productpricelevels', parameterName: 'productpricelevel' },
-            { pathName: 'proprilveditview', parameterName: 'proprilveditview' },
         ];
         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 openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(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: 'product-price-level-pro-prilv-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.productpricelevel.views.proprilveditview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_CRM/src/pages/product/product-substitute-grid-view/product-substitute-grid-view-base.tsx

@@ -441,16 +441,27 @@ export class ProductSubstituteGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'productsubstitutes', parameterName: 'productsubstitute' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(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: 'product-substitute-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.productsubstitute.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -480,14 +491,27 @@ export class ProductSubstituteGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'productsubstitutes', parameterName: 'productsubstitute' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         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 openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(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: 'product-substitute-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.productsubstitute.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_CRM/src/pages/sales/quote-detail-quo-detail-grid-view/quote-detail-quo-detail-grid-view-base.tsx

@@ -441,16 +441,27 @@ export class QuoteDetailQuoDetailGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'quotedetails', parameterName: 'quotedetail' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(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: 'quote-detail-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.quotedetail.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -480,14 +491,27 @@ export class QuoteDetailQuoDetailGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'quotedetails', parameterName: 'quotedetail' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         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 openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(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: 'quote-detail-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.quotedetail.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_CRM/src/pages/sales/sales-literature-item-grid-view/sales-literature-item-grid-view-base.tsx

@@ -441,16 +441,27 @@ export class SalesLiteratureItemGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'salesliteratureitems', parameterName: 'salesliteratureitem' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(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: 'sales-literature-item-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.salesliteratureitem.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -480,14 +491,27 @@ export class SalesLiteratureItemGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'salesliteratureitems', parameterName: 'salesliteratureitem' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         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 openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(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: 'sales-literature-item-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.salesliteratureitem.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_CRM/src/pages/sales/sales-literature-item-grid-view/sales-literature-item-grid-view.html

 <studio-view-style2 viewName="salesliteratureitemgridview" viewTitle="销售附件表格视图" class='degridview sales-literature-item-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">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>

app_CRM/src/pages/sales/sales-order-detail-soproduct-grid-view/sales-order-detail-soproduct-grid-view-base.tsx

@@ -441,16 +441,27 @@ export class SalesOrderDetailSOProductGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'salesorderdetails', parameterName: 'salesorderdetail' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(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: 'sales-order-detail-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.salesorderdetail.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -480,14 +491,27 @@ export class SalesOrderDetailSOProductGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'salesorderdetails', parameterName: 'salesorderdetail' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         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 openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(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: 'sales-order-detail-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.salesorderdetail.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_CRM/src/pages/sales/sales-order-summary-view/sales-order-summary-view.html

 <studio-view-style2 viewName="salesordersummaryview" viewTitle="订单数据看板视图" class='deportalview sales-order-summary-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <view_dashboard 
                     :viewState="viewState"  
                     :viewparams="viewparams" 

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

@@ -543,9 +543,6 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '8b806fb12589b2fc17d1bb90f4b5422e',
-                'da3f8c1f20f440f3df54d6c13a8de586',
-                '6debde861c6e6f91eeb442cb869e9737',
             ],
         },
         {
@@ -1244,7 +1241,6 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                'e52af970c14fd89546ac8ccaecab460c',
                 '1bc1e98908024887f7476018b9e314d1',
             ],
         },

app_CRM/src/widgets/competitor/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel.html

@@ -3,6 +3,12 @@
         <tab-pane :index="0" name='tabviewpanel' tab='infotabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-info-circle',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '概览'),
                     h('Badge', {
                         props: {
@@ -26,6 +32,12 @@
         <tab-pane :index="1" name='tabviewpanel2' tab='infotabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-envelope-o',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '商机'),
                     h('Badge', {
                         props: {

app_CRM/src/widgets/invoice/board-dashboard/board-dashboard.html

@@ -16,7 +16,7 @@
                             :viewState="viewState"  
                             :viewparams="viewparams" 
                             :context="context" 
-                            :height="300"
+                            :height="0"
                             :width="0"
                             name="dashboard_sysportlet1"  
                             ref='dashboard_sysportlet1' 

app_CRM/src/widgets/invoice/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel.html

@@ -3,6 +3,12 @@
         <tab-pane :index="0" name='tabviewpanel' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-info-circle',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '概览'),
                     h('Badge', {
                         props: {
@@ -26,6 +32,12 @@
         <tab-pane :index="1" name='tabviewpanel2' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-cube',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '产品'),
                     h('Badge', {
                         props: {

app_CRM/src/widgets/invoice/view-inv-info-portlet/view-inv-info-portlet-base.tsx

@@ -100,7 +100,7 @@ export class View_InvInfoPortletBase extends MainControlBase {
                 return this.height+'px';
             }
         } else {
-            return '300px';
+            return 'auto';
         }
     }
 

app_CRM/src/widgets/invoice/view-inv-info-portlet/view-inv-info-portlet.html

-<div class='portlet view-inv-info ' :style="{'height': isAdaptiveSize ? 'calc(100% - 16px)' : getHeight,}">
+<div class='portlet view-inv-info ' :style="{}">
         <p class='portlet-title'>
             <span>
             

app_CRM/src/widgets/product/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel.html

@@ -3,6 +3,12 @@
         <tab-pane :index="0" name='tabviewpanel' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-info-circle',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '概览'),
                     h('Badge', {
                         props: {
@@ -26,6 +32,12 @@
         <tab-pane :index="1" name='tabviewpanel2' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-cube',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '捆绑销售产品'),
                     h('Badge', {
                         props: {
@@ -49,6 +61,12 @@
         <tab-pane :index="2" name='tabviewpanel3' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-money',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '价目表项'),
                     h('Badge', {
                         props: {
@@ -72,6 +90,12 @@
         <tab-pane :index="3" name='tabviewpanel4' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-cubes',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '产品关系'),
                     h('Badge', {
                         props: {

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

@@ -16,7 +16,7 @@
                             :viewState="viewState"  
                             :viewparams="viewparams" 
                             :context="context" 
-                            :height="300"
+                            :height="0"
                             :width="0"
                             name="dashboard_sysportlet1"  
                             ref='dashboard_sysportlet1' 

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

@@ -74,9 +74,6 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
         shippingmethodcode: null,
         shipto_postalcode: null,
         willcall: null,
-        transactioncurrencyid: null,
-        opportunityid: null,
-        pricelevelid: null,
         quoteid: null,
         quote:null,
     };
@@ -88,22 +85,6 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
      * @memberof AbstractInfoEditFormBase
      */
     public rules: any = {
-        quotenumber: [
-            { required: true, type: 'string', message: '报价单 ID 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '报价单 ID 值不能为空', trigger: 'blur' },
-        ],
-        quotename: [
-            { required: true, type: 'string', message: '报价名称 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '报价名称 值不能为空', trigger: 'blur' },
-        ],
-        customerid: [
-            { required: true, type: 'string', message: '潜在客户 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '潜在客户 值不能为空', trigger: 'blur' },
-        ],
-        statecode: [
-            { required: true, type: 'number', message: '状态 值不能为空', trigger: 'change' },
-            { required: true, type: 'number', message: '状态 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**
@@ -173,12 +154,6 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
 
         willcall: new FormItemModel({ caption: '送货地址', detailType: 'FORMITEM', name: 'willcall', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
-        transactioncurrencyid: new FormItemModel({ caption: '货币', detailType: 'FORMITEM', name: 'transactioncurrencyid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
-        opportunityid: new FormItemModel({ caption: '商机', detailType: 'FORMITEM', name: 'opportunityid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
-        pricelevelid: new FormItemModel({ caption: '价目表', detailType: 'FORMITEM', name: 'pricelevelid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
         quoteid: new FormItemModel({ caption: '报价单', detailType: 'FORMITEM', name: 'quoteid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 }),
 
     };

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

@@ -148,21 +148,6 @@ export default class AbstractInfoModel {
         prop: 'willcall',
         dataType: 'YESNO',
       },
-      {
-        name: 'transactioncurrencyid',
-        prop: 'transactioncurrencyid',
-        dataType: 'PICKUP',
-      },
-      {
-        name: 'opportunityid',
-        prop: 'opportunityid',
-        dataType: 'PICKUP',
-      },
-      {
-        name: 'pricelevelid',
-        prop: 'pricelevelid',
-        dataType: 'PICKUP',
-      },
       {
         name: 'quoteid',
         prop: 'quoteid',

app_CRM/src/widgets/quote/abstract-info-form/abstract-info-form-service.ts

@@ -2,9 +2,6 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import QuoteService from '@/service/quote/quote-service';
 import AbstractInfoModel from './abstract-info-form-model';
-import TransactionCurrencyService from '@/service/transaction-currency/transaction-currency-service';
-import OpportunityService from '@/service/opportunity/opportunity-service';
-import PriceLevelService from '@/service/price-level/price-level-service';
 
 
 /**
@@ -44,30 +41,6 @@ export default class AbstractInfoService extends ControlService {
         this.model = new AbstractInfoModel();
     }
 
-    /**
-     * 货币服务对象
-     *
-     * @type {TransactionCurrencyService}
-     * @memberof AbstractInfoService
-     */
-    public transactioncurrencyService: TransactionCurrencyService = new TransactionCurrencyService();
-
-    /**
-     * 商机服务对象
-     *
-     * @type {OpportunityService}
-     * @memberof AbstractInfoService
-     */
-    public opportunityService: OpportunityService = new OpportunityService();
-
-    /**
-     * 价目表服务对象
-     *
-     * @type {PriceLevelService}
-     * @memberof AbstractInfoService
-     */
-    public pricelevelService: PriceLevelService = new PriceLevelService();
-
     /**
      * 处理数据
      *
@@ -107,15 +80,6 @@ export default class AbstractInfoService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
-        if (Object.is(serviceName, 'TransactionCurrencyService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.transactioncurrencyService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'transactioncurrencyid', 'transactioncurrency');
-        }
-        if (Object.is(serviceName, 'OpportunityService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.opportunityService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'opportunityid', 'opportunity');
-        }
-        if (Object.is(serviceName, 'PriceLevelService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.pricelevelService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'pricelevelid', 'pricelevel');
-        }
 
         return Promise.reject([])
     }

app_CRM/src/widgets/quote/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel.html

@@ -3,6 +3,12 @@
         <tab-pane :index="0" name='tabviewpanel' tab='infotabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-info-circle',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '概览'),
                     h('Badge', {
                         props: {
@@ -26,6 +32,12 @@
         <tab-pane :index="1" name='tabviewpanel2' tab='infotabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-cube',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '报价单明细'),
                     h('Badge', {
                         props: {

app_CRM/src/widgets/quote/view-quo-abs-portlet/view-quo-abs-portlet-base.tsx

@@ -100,7 +100,7 @@ export class View_QuoAbsPortletBase extends MainControlBase {
                 return this.height+'px';
             }
         } else {
-            return '300px';
+            return 'auto';
         }
     }
 

app_CRM/src/widgets/quote/view-quo-abs-portlet/view-quo-abs-portlet.html

-<div class='portlet view-quo-abs ' :style="{'height': isAdaptiveSize ? 'calc(100% - 16px)' : getHeight,}">
+<div class='portlet view-quo-abs ' :style="{}">
         <div class="portlet-without-title">
         <quote-info-abstract :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></quote-info-abstract>
         </div>

app_CRM/src/widgets/sales-literature/info-form/info-form-base.tsx

@@ -68,7 +68,6 @@ export class InfoEditFormBase extends EditFormControlBase {
         subjectname: null,
         literaturetypecode: null,
         description: null,
-        subjectid: null,
         salesliteratureid: null,
         salesliterature:null,
     };
@@ -80,10 +79,6 @@ export class InfoEditFormBase extends EditFormControlBase {
      * @memberof InfoEditFormBase
      */
     public rules: any = {
-        salesliteraturename: [
-            { required: true, type: 'string', message: '标题 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '标题 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**
@@ -125,8 +120,6 @@ export class InfoEditFormBase extends EditFormControlBase {
 
         description: new FormItemModel({ caption: '说明', detailType: 'FORMITEM', name: 'description', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
-        subjectid: new FormItemModel({ caption: '主题', detailType: 'FORMITEM', name: 'subjectid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
         salesliteratureid: new FormItemModel({ caption: '销售宣传资料', detailType: 'FORMITEM', name: 'salesliteratureid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 }),
 
     };

app_CRM/src/widgets/sales-literature/info-form/info-form-model.ts

@@ -75,11 +75,6 @@ export default class InfoModel {
         prop: 'description',
         dataType: 'TEXT',
       },
-      {
-        name: 'subjectid',
-        prop: 'subjectid',
-        dataType: 'PICKUP',
-      },
       {
         name: 'salesliteratureid',
         prop: 'salesliteratureid',

app_CRM/src/widgets/sales-literature/info-form/info-form-service.ts

@@ -2,7 +2,6 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import SalesLiteratureService from '@/service/sales-literature/sales-literature-service';
 import InfoModel from './info-form-model';
-import SubjectService from '@/service/subject/subject-service';
 
 
 /**
@@ -42,14 +41,6 @@ export default class InfoService extends ControlService {
         this.model = new InfoModel();
     }
 
-    /**
-     * 主题服务对象
-     *
-     * @type {SubjectService}
-     * @memberof InfoService
-     */
-    public subjectService: SubjectService = new SubjectService();
-
     /**
      * 处理数据
      *
@@ -89,9 +80,6 @@ export default class InfoService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
-        if (Object.is(serviceName, 'SubjectService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.subjectService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'subjectid', 'subject');
-        }
 
         return Promise.reject([])
     }

app_CRM/src/widgets/sales-literature/info-form/info-form.html

-<i-form :model="this.data" class='app-form' ref='form'  id='salesliterature_info' style="">
+<i-form :model="this.data" class='app-form info-form-mode' ref='form'  id='salesliterature_info' style="">
     <input style="display:none;" />
     <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.salesliterature.info_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.salesliterature.info_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <i-col v-show="detailsModel.salesliteraturename.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='salesliteraturename' :itemRules="this.rules.salesliteraturename" class='' :caption="$t('entities.salesliterature.info_form.details.salesliteraturename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.salesliteraturename.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.salesliteraturename"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.salesliteraturename.disabled" type='text'  style=""></input-box>
+    
+<app-span name='salesliteraturename' :value="data.salesliteraturename" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.subjectname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='subjectname' :itemRules="this.rules.subjectname" class='' :caption="$t('entities.salesliterature.info_form.details.subjectname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.subjectname.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.subjectname.disabled"
-  name='subjectname'
-  deMajorField='title'
-  deKeyField='subject'
-  :service="service"
-  :acParams="{ serviceName: 'SubjectService', interfaceName: 'FetchDefault'}"
-  valueitem='subjectid' 
-  :value="data.subjectname" 
-  editortype="" 
-  :pickupView="{ viewname: 'subject-pickup-view', title: $t('entities.subject.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'subjects', parameterName: 'subject' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+<app-span name='subjectname' :value="data.subjectname" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.literaturetypecode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='literaturetypecode' :itemRules="this.rules.literaturetypecode" class='' :caption="$t('entities.salesliterature.info_form.details.literaturetypecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.literaturetypecode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.literaturetypecode" 
-    :data="data" 
-    :context="context"
-    :viewparams="viewparams"
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :disabled="detailsModel.literaturetypecode.disabled"  
-    tag='Salesliterature__LiteratureTypeCode' 
-    codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+<app-span name='literaturetypecode' :value="data.literaturetypecode" tag='Salesliterature__LiteratureTypeCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.description.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
     <app-form-item name='description' :itemRules="this.rules.description" class='' :caption="$t('entities.salesliterature.info_form.details.description')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.description.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.description"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.description.disabled" type='text'  style=""></input-box>
+    
+<app-span name='description' :value="data.description" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
@@ -68,7 +39,7 @@
 
 </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.salesliterature.info_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.salesliterature.info_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <i-col v-show="detailsModel.druipart1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-druipart

app_CRM/src/widgets/sales-literature/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel.html

@@ -3,6 +3,12 @@
         <tab-pane :index="0" name='tabviewpanel' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-info-circle',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '概览'),
                     h('Badge', {
                         props: {
@@ -26,6 +32,12 @@
         <tab-pane :index="1" name='tabviewpanel2' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-cube',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '产品'),
                     h('Badge', {
                         props: {
@@ -49,6 +61,12 @@
         <tab-pane :index="2" name='tabviewpanel3' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-user-secret',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '竞争对手'),
                     h('Badge', {
                         props: {

app_CRM/src/widgets/sales-literature/sal-lit-info-dashboard/sal-lit-info-dashboard.html

@@ -16,7 +16,7 @@
                             :viewState="viewState"  
                             :viewparams="viewparams" 
                             :context="context" 
-                            :height="300"
+                            :height="0"
                             :width="0"
                             name="dashboard_sysportlet1"  
                             ref='dashboard_sysportlet1' 

app_CRM/src/widgets/sales-literature/view-sal-lit-info-portlet/view-sal-lit-info-portlet-base.tsx

@@ -100,7 +100,7 @@ export class View_SalLitInfoPortletBase extends MainControlBase {
                 return this.height+'px';
             }
         } else {
-            return '300px';
+            return 'auto';
         }
     }
 

app_CRM/src/widgets/sales-literature/view-sal-lit-info-portlet/view-sal-lit-info-portlet.html

-<div class='portlet view-sal-lit-info ' :style="{'height': isAdaptiveSize ? 'calc(100% - 16px)' : getHeight,}">
+<div class='portlet view-sal-lit-info ' :style="{}">
         <div class="portlet-without-title">
         <sales-literature-info-sal-lit-view :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></sales-literature-info-sal-lit-view>
         </div>

app_CRM/src/widgets/sales-order/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel.html

@@ -3,6 +3,12 @@
         <tab-pane :index="0" name='tabviewpanel' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-info-circle',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '概览'),
                     h('Badge', {
                         props: {
@@ -26,6 +32,12 @@
         <tab-pane :index="1" name='tabviewpanel2' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-cube',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '产品'),
                     h('Badge', {
                         props: {

app_CRM/src/widgets/sales-order/soinfo-dashboard/soinfo-dashboard.html

@@ -16,7 +16,7 @@
                             :viewState="viewState"  
                             :viewparams="viewparams" 
                             :context="context" 
-                            :height="300"
+                            :height="0"
                             :width="0"
                             name="dashboard_sysportlet1"  
                             ref='dashboard_sysportlet1' 

app_CRM/src/widgets/sales-order/view-soinfo-portlet/view-soinfo-portlet-base.tsx

@@ -100,7 +100,7 @@ export class View_SOInfoPortletBase extends MainControlBase {
                 return this.height+'px';
             }
         } else {
-            return '300px';
+            return 'auto';
         }
     }
 

app_CRM/src/widgets/sales-order/view-soinfo-portlet/view-soinfo-portlet.html

-<div class='portlet view-soinfo ' :style="{'height': isAdaptiveSize ? 'calc(100% - 16px)' : getHeight,}">
+<div class='portlet view-soinfo ' :style="{}">
         <div class="portlet-without-title">
         <sales-order-info-soview :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></sales-order-info-soview>
         </div>